Release - 2025 July

.github/workflows/actions.yml

@@ -42,15 +42,28 @@ jobs:
             exit 1;
           }
 
+    - name: Decrypt Service Account Key File
+      working-directory: ./
+      run: |
+        openssl enc -aes-256-cbc -d -K "$OPENSSL_KEY" -iv "$OPENSSL_IV" -in ci-mapswipe-firebase-adminsdk-80fzw-ebce84bd5b.json.enc -out mapswipe_workers/serviceAccountKey.json
+      env:
+        OPENSSL_PASSPHRASE: ${{ secrets.OPENSSL_PASSPHRASE }}
+        OPENSSL_KEY: ${{ secrets.OPENSSL_KEY }}
+        OPENSSL_IV: ${{ secrets.OPENSSL_IV }}
+
+    - name: Build docker images
+      run: |
+        # Create a mock file for wal-g setup
+        touch postgres/serviceAccountKey.json
+        docker compose build postgres firebase_deploy mapswipe_workers_creation django
+
     - name: Setup Postgres Database Container
       env:
         POSTGRES_PASSWORD: postgres
         POSTGRES_USER: postgres
         POSTGRES_DB: postgres
       run: |
-        # Create a mock file for wal-g setup
-        touch postgres/serviceAccountKey.json
-        docker compose up --build --detach postgres
+        docker compose up --detach postgres
         for i in {1..5}; do docker compose exec -T postgres pg_isready && s=0 && break || s=$? && sleep 5; done; (docker compose logs postgres && exit $s)
 
     - name: Deploy Firebase Rules and Functions
@@ -60,15 +73,6 @@ jobs:
       run: |
         docker compose run --rm firebase_deploy sh -c "firebase use $FIREBASE_DB && firebase deploy --token $FIREBASE_TOKEN --only database"
 
-    - name: Decrypt Service Account Key File
-      working-directory: ./
-      run: |
-        openssl enc -aes-256-cbc -d -K "$OPENSSL_KEY" -iv "$OPENSSL_IV" -in ci-mapswipe-firebase-adminsdk-80fzw-ebce84bd5b.json.enc -out mapswipe_workers/serviceAccountKey.json
-      env:
-        OPENSSL_PASSPHRASE: ${{ secrets.OPENSSL_PASSPHRASE }}
-        OPENSSL_KEY: ${{ secrets.OPENSSL_KEY }}
-        OPENSSL_IV: ${{ secrets.OPENSSL_IV }}
-
     - name: Run Tests
       working-directory: ./mapswipe_workers
       env:

community-dashboard/app/views/StatsBoard/index.tsx

@@ -43,12 +43,14 @@ import InformationCard from '#components/InformationCard';
 import areaSvg from '#resources/icons/area.svg';
 import sceneSvg from '#resources/icons/scene.svg';
 import featureSvg from '#resources/icons/feature.svg';
+import validateImageSvg from '#resources/icons/validate-image.svg';
 import {
     ContributorTimeStatType,
     OrganizationSwipeStatsType,
     ProjectTypeSwipeStatsType,
     ProjectTypeAreaStatsType,
     ContributorSwipeStatType,
+    ProjectTypeEnum,
 } from '#generated/types';
 import { mergeItems } from '#utils/common';
 import {
@@ -67,17 +69,28 @@ const CHART_BREAKPOINT = 700;
 export type ActualContributorTimeStatType = ContributorTimeStatType & { totalSwipeTime: number };
 const UNKNOWN = '-1';
 const BUILD_AREA = 'BUILD_AREA';
+const MEDIA = 'MEDIA';
+const DIGITIZATION = 'DIGITIZATION';
 const FOOTPRINT = 'FOOTPRINT';
 const CHANGE_DETECTION = 'CHANGE_DETECTION';
+const VALIDATE_IMAGE = 'VALIDATE_IMAGE';
 const COMPLETENESS = 'COMPLETENESS';
 const STREET = 'STREET';
 
 // FIXME: the name property is not used properly
-const projectTypes: Record<string, { color: string, name: string }> = {
+const projectTypes: Record<ProjectTypeEnum | '-1', { color: string, name: string }> = {
     [UNKNOWN]: {
         color: '#cacaca',
         name: 'Unknown',
     },
+    [MEDIA]: {
+        color: '#cacaca',
+        name: 'Media',
+    },
+    [DIGITIZATION]: {
+        color: '#cacaca',
+        name: 'Digitization',
+    },
     [BUILD_AREA]: {
         color: '#f8a769',
         name: 'Find',
@@ -94,6 +107,10 @@ const projectTypes: Record<string, { color: string, name: string }> = {
         color: '#fb8072',
         name: 'Completeness',
     },
+    [VALIDATE_IMAGE]: {
+        color: '#a1b963',
+        name: 'Validate Image',
+    },
     [STREET]: {
         color: '#808080',
         name: 'Street',
@@ -376,14 +393,16 @@ function StatsBoard(props: Props) {
     const sortedProjectSwipeType = useMemo(
         () => (
             swipeByProjectType
-                ?.map((item) => ({
-                    ...item,
-                    projectType: (
-                        isDefined(item.projectType)
-                        && isDefined(projectTypes[item.projectType])
-                    ) ? item.projectType
-                        : UNKNOWN,
-                }))
+                ?.map((item) => {
+                    const projectType: ProjectTypeEnum | '-1' = (
+                        isDefined(item.projectType) && isDefined(projectTypes[item.projectType])
+                    ) ? item.projectType : UNKNOWN;
+
+                    return ({
+                        ...item,
+                        projectType,
+                    });
+                })
                 .sort((a, b) => compareNumber(a.totalSwipes, b.totalSwipes, -1)) ?? []
         ),
         [swipeByProjectType],
@@ -449,6 +468,10 @@ function StatsBoard(props: Props) {
         (project) => project.projectType === FOOTPRINT,
     )?.totalSwipes;
 
+    const validateImageTotalSwipes = swipeByProjectType?.find(
+        (project) => project.projectType === VALIDATE_IMAGE,
+    )?.totalSwipes;
+
     const organizationColors = scaleOrdinal<string, string | undefined>()
         .domain(totalSwipesByOrganizationStats?.map(
             (organization) => (organization.organizationName),
@@ -699,6 +722,29 @@ function StatsBoard(props: Props) {
                         subHeading="Compare"
                         variant="stat"
                     />
+                    <InformationCard
+                        icon={(
+                            <img
+                                src={validateImageSvg}
+                                alt="group icon"
+                            />
+                        )}
+                        value={(
+                            <NumberOutput
+                                className={styles.numberOutput}
+                                value={validateImageTotalSwipes}
+                                normal
+                                invalidText={0}
+                            />
+                        )}
+                        label={(
+                            <div className={styles.infoLabel}>
+                                Images Validated
+                            </div>
+                        )}
+                        subHeading="Validate Image"
+                        variant="stat"
+                    />
                 </div>
                 <div className={styles.overallStatsContainer}>
                     <InformationCard

community-dashboard/app/views/StatsBoard/styles.css

@@ -67,7 +67,7 @@
             >* {
                 flex-basis: 0;
                 flex-grow: 1;
-                min-width: 12rem;
+                min-width: 24rem;
 
                 @media (max-width: 48rem) {
                     min-width: 100%;

community-dashboard/docker-compose.yml

@@ -2,7 +2,6 @@ version: '3.3'
 
 services:
   react:
-    build: .
     command: sh -c 'yarn install --frozen-lockfile && yarn start'
     build:
       context: ./
@@ -15,4 +14,4 @@ services:
     volumes:
       - .:/code
     ports:
-      - '3080:3080'
+      - '3081:3081'

django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-buster
+FROM python:3.10-bullseye
 
 LABEL maintainer="Mapswipe info@mapswipe.org"
 

django/apps/aggregated/management/commands/update_aggregated_data.py

@@ -55,6 +55,7 @@
               WHEN P.project_type = {Project.Type.CHANGE_DETECTION.value} THEN 11.2
               -- FOOTPRINT: Not calculated right now
               WHEN P.project_type = {Project.Type.FOOTPRINT.value} THEN 6.1
+              WHEN P.project_type = {Project.Type.VALIDATE_IMAGE.value} THEN 6.1
               WHEN P.project_type = {Project.Type.STREET.value} THEN 65
               ELSE 1
             END
@@ -111,6 +112,7 @@
               WHEN P.project_type = {Project.Type.CHANGE_DETECTION.value} THEN 11.2
               -- FOOTPRINT: Not calculated right now
               WHEN P.project_type = {Project.Type.FOOTPRINT.value} THEN 6.1
+              WHEN P.project_type = {Project.Type.VALIDATE_IMAGE.value} THEN 6.1
               WHEN P.project_type = {Project.Type.STREET.value} THEN 65
               ELSE 1
             END
@@ -136,8 +138,10 @@
             G.group_id,
             (
                 CASE
-                    -- Hide area for Footprint
+                    -- Hide area for Footprint and Validate Image
+                    -- FIXME: What should we do for Project.Type.STREET.value
                     WHEN P.project_type = {Project.Type.FOOTPRINT.value} THEN 0
+                    WHEN P.project_type = {Project.Type.VALIDATE_IMAGE.value} THEN 0
                     ELSE G.total_area
                 END
             ) as total_task_group_area,

django/apps/existing_database/models.py

@@ -69,6 +69,7 @@ class Type(models.IntegerChoices):
         MEDIA = 5, "Media"
         DIGITIZATION = 6, "Digitization"
         STREET = 7, "Street"
+        VALIDATE_IMAGE = 10, "Validate Image"
 
     project_id = models.CharField(primary_key=True, max_length=999)
     created = models.DateTimeField(blank=True, null=True)

django/schema.graphql

@@ -100,6 +100,7 @@ enum ProjectTypeEnum {
   MEDIA
   DIGITIZATION
   STREET
+  VALIDATE_IMAGE
 }
 
 type ProjectTypeSwipeStatsType {

docker-compose.tc.yaml

@@ -33,6 +33,7 @@ x-mapswipe-workers: &base_mapswipe_workers
     SLACK_CHANNEL: '${SLACK_CHANNEL}'
     SENTRY_DSN: '${SENTRY_DSN}'
     OSMCHA_API_KEY: '${OSMCHA_API_KEY}'
+    MAPILLARY_API_KEY: '${MAPILLARY_API_KEY}'
   depends_on:
     - postgres
   volumes:

docker-compose.yaml

@@ -230,15 +230,23 @@ services:
             OSM_OAUTH_API_URL: '${OSM_OAUTH_API_URL}'
             OSM_OAUTH_CLIENT_ID: '${OSM_OAUTH_CLIENT_ID}'
             OSM_OAUTH_CLIENT_SECRET: '${OSM_OAUTH_CLIENT_SECRET}'
+            OSM_OAUTH_REDIRECT_URI_WEB: '${OSM_OAUTH_REDIRECT_URI_WEB}'
+            OSM_OAUTH_APP_LOGIN_LINK_WEB: '${OSM_OAUTH_APP_LOGIN_LINK_WEB}'
+            OSM_OAUTH_CLIENT_ID_WEB: '${OSM_OAUTH_CLIENT_ID_WEB}'
+            OSM_OAUTH_CLIENT_SECRET_WEB: '${OSM_OAUTH_CLIENT_SECRET_WEB}'
         command: >-
           sh -c "firebase use $FIREBASE_DB &&
           firebase target:apply hosting auth \"$FIREBASE_AUTH_SITE\" &&
           firebase functions:config:set
           osm.redirect_uri=\"$OSM_OAUTH_REDIRECT_URI\"
+          osm.redirect_uri_web=\"$OSM_OAUTH_REDIRECT_URI_WEB\"
           osm.app_login_link=\"$OSM_OAUTH_APP_LOGIN_LINK\"
+          osm.app_login_link_web=\"$OSM_OAUTH_APP_LOGIN_LINK_WEB\"
           osm.api_url=\"$OSM_OAUTH_API_URL\"
           osm.client_id=\"$OSM_OAUTH_CLIENT_ID\"
-          osm.client_secret=\"$OSM_OAUTH_CLIENT_SECRET\" &&
+          osm.client_id_web=\"$OSM_OAUTH_CLIENT_ID_WEB\"
+          osm.client_secret=\"$OSM_OAUTH_CLIENT_SECRET\"
+          osm.client_secret_web=\"$OSM_OAUTH_CLIENT_SECRET_WEB\" &&
           firebase deploy --token $FIREBASE_TOKEN --only functions,hosting,database"
 
     django:

example.env

@@ -38,10 +38,15 @@ OSMCHA_API_KEY=
 
 # OSM OAuth Configuration
 OSM_OAUTH_REDIRECT_URI=
+OSM_OAUTH_REDIRECT_URI_WEB=
 OSM_OAUTH_API_URL=
 OSM_OAUTH_CLIENT_ID=
+OSM_OAUTH_CLIENT_ID_WEB=
 OSM_OAUTH_CLIENT_SECRET=
-OSM_APP_LOGIN_LINK=
+OSM_OAUTH_CLIENT_SECRET_WEB=
+OSM_OAUTH_APP_LOGIN_LINK=
+OSM_OAUTH_APP_LOGIN_LINK_WEB=
+
 
 # DJANGO For more info look at django/mapswipe/settings.py::L22
 DJANGO_SECRET_KEY=

firebase/README.md

@@ -20,6 +20,11 @@ expose the authentication functions publicly.
 * `firebase deploy --only functions,hosting`
 * `firebase deploy --only database:rules`
 
+## Deploy with Makefile
+You can also deploy the changes to Firebase using make: 
+* Make sure to remove the firebase_deploy docker image first: `docker rmi python-mapswipe-workers-firebase_deploy`
+* `make update_firebase_functions_and_db_rules`
+
 ## Notes on OAuth (OSM login)
 
 Refer to [the notes in the app repository](https://github.com/mapswipe/mapswipe/blob/master/docs/osm_login.md).
@@ -30,12 +35,16 @@ Some specifics about the related functions:
 - Before deploying, set the required firebase config values in environment:
 FIXME: replace env vars with config value names
   - OSM_OAUTH_REDIRECT_URI `osm.redirect_uri`: `https://dev-auth.mapswipe.org/token` or `https://auth.mapswipe.org/token`
+  - OSM_OAUTH_REDIRECT_URI_WEB: `https://dev-auth.mapswipe.org/tokenweb` or `https://auth.mapswipe.org/tokenweb`
   - OSM_OAUTH_APP_LOGIN_LINK `osm.app_login_link`: 'devmapswipe://login/osm' or 'mapswipe://login/osm'
+  - OSM_OAUTH_APP_LOGIN_LINK_WEB: `https://web.mapswipe.org/dev/#/osm-callback` or `https://web.mapswipe.org/#/osm-callback`
   - OSM_OAUTH_API_URL `osm.api_url`: 'https://master.apis.dev.openstreetmap.org/' or 'https://www.openstreetmap.org/' (include the
     trailing slash)
   - OSM_OAUTH_CLIENT_ID `osm.client_id`: find it on the OSM application page
   - OSM_OAUTH_CLIENT_SECRET `osm.client_secret`: same as above. Note that this can only be seen once when the application is created. Do not
     lose it!
+  - OSM_OAUTH_CLIENT_ID_WEB: This is the ID of a __different__ registered OSM OAuth client for the web version that needs to have `https://dev-auth.mapswipe.org/tokenweb` or `https://auth.mapswipe.org/tokenweb` set as redirect URI.
+  - OSM_OAUTH_CLIENT_SECRET_WEB: This is the secret of the OSM OAuth client for MapSwipe web version.
 - Deploy the functions as explained above
 - Expose the functions publicly through firebase hosting, this is done in `/firebase/firebase.json` under the `hosting`
   key.

firebase/firebase.json

@@ -20,6 +20,14 @@
       {
         "source": "/token",
         "function": "osmAuth-token"
+      },
+      {
+        "source": "/redirectweb",
+        "function": "osmAuth-redirectweb"
+      },
+      {
+        "source": "/tokenweb",
+        "function": "osmAuth-tokenweb"
       }
     ]
   },

firebase/functions/src/index.ts

@@ -8,7 +8,7 @@ admin.initializeApp();
 // all functions are bundled together. It's less than ideal, but it does not
 // seem possible to split them using the split system for multiple sites from
 // https://firebase.google.com/docs/hosting/multisites
-import {redirect, token} from './osm_auth';
+import {redirect, token, redirectweb, tokenweb} from './osm_auth';
 import { formatProjectTopic, formatUserName } from './utils';
 
 exports.osmAuth = {};
@@ -23,6 +23,14 @@ exports.osmAuth.token = functions.https.onRequest((req, res) => {
     token(req, res, admin);
 });
 
+exports.osmAuth.redirectweb = functions.https.onRequest((req, res) => {
+    redirectweb(req, res);
+});
+
+exports.osmAuth.tokenweb = functions.https.onRequest((req, res) => {
+    tokenweb(req, res, admin);
+});
+
 /*
     Log the userIds of all users who finished a group to /v2/userGroups/{projectId}/{groupId}/.
     Gets triggered when new results of a group are written to the database.