Merge pull request #1008 from mapswipe/dev

Release - 2025 March

Author: Hagellach37

.github/workflows/actions.yml

@@ -80,6 +80,7 @@ jobs:
         POSTGRES_DB: postgres
         OSMCHA_API_KEY: ${{ secrets.OSMCHA_API_KEY }}
         DJANGO_SECRET_KEY: test-django-secret-key
+        MAPILLARY_API_KEY: ${{ secrets.MAPILLARY_API_KEY }}
         COMPOSE_FILE: ../docker-compose.yaml:../docker-compose-ci.yaml
       run: |
         docker compose run --rm mapswipe_workers_creation python -m unittest discover --verbose --start-directory tests/unittests/

django/apps/existing_database/models.py

@@ -66,6 +66,9 @@ class Type(models.IntegerChoices):
         FOOTPRINT = 2, "Validate"
         CHANGE_DETECTION = 3, "Compare"
         COMPLETENESS = 4, "Completeness"
+        MEDIA = 5, "Media"
+        DIGITIZATION = 6, "Digitization"
+        STREET = 7, "Street"
 
     project_id = models.CharField(primary_key=True, max_length=999)
     created = models.DateTimeField(blank=True, null=True)
@@ -127,7 +130,7 @@ class Task(Model):
     project = models.ForeignKey(Project, models.DO_NOTHING, related_name="+")
     group_id = models.CharField(max_length=999)
     task_id = models.CharField(max_length=999)
-    geom = gis_models.MultiPolygonField(blank=True, null=True)
+    geom = gis_models.GeometryField(blank=True, null=True)
     # Database uses JSON instead of JSONB (not supported by django)
     project_type_specifics = models.TextField(blank=True, null=True)
 

django/schema.graphql

@@ -97,6 +97,9 @@ enum ProjectTypeEnum {
   FOOTPRINT
   CHANGE_DETECTION
   COMPLETENESS
+  MEDIA
+  DIGITIZATION
+  STREET
 }
 
 type ProjectTypeSwipeStatsType {

docker-compose.yaml

@@ -76,6 +76,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:

example.env

@@ -75,3 +75,6 @@ COMMUNITY_DASHBOARD_GRAPHQL_ENDPOINT=https://api.example.com/graphql/
 COMMUNITY_DASHBOARD_SENTRY_DSN=
 COMMUNITY_DASHBOARD_SENTRY_TRACES_SAMPLE_RATE=
 COMMUNITY_DASHBOARD_MAPSWIPE_WEBSITE=https://mapswipe.org
+
+# Mapillary
+MAPILLARY_API_KEY=

manager-dashboard/app/Base/configs/projectTypes.ts

@@ -3,6 +3,7 @@ import {
     PROJECT_TYPE_BUILD_AREA,
     PROJECT_TYPE_FOOTPRINT,
     PROJECT_TYPE_CHANGE_DETECTION,
+    PROJECT_TYPE_STREET,
     PROJECT_TYPE_COMPLETENESS,
 } from '#utils/common';
 
@@ -15,6 +16,7 @@ const mapswipeProjectTypeOptions: {
     { value: PROJECT_TYPE_BUILD_AREA, label: 'Find' },
     { value: PROJECT_TYPE_FOOTPRINT, label: 'Validate' },
     { value: PROJECT_TYPE_CHANGE_DETECTION, label: 'Compare' },
+    { value: PROJECT_TYPE_STREET, label: 'Street' },
     { value: PROJECT_TYPE_COMPLETENESS, label: 'Completeness' },
 ];
 

manager-dashboard/app/Base/styles.css

@@ -122,9 +122,14 @@ p {
     --line-height-relaxed: 1.625;
     --line-height-loose: 2;
 
-
     --shadow-card: 0 2px 4px -2px var(--color-shadow);
 
     --duration-transition-medium: .2s;
 
+    --color-background-hover-light: rgba(0, 0, 0, .04);
+    --width-calendar-date: 2.4rem;
+
+    --opacity-watermark: 0.3;
+    --color-text-disabled: rgba(0, 0, 0, .3);
+
 }

manager-dashboard/app/components/Calendar/CalendarDate/index.tsx

@@ -0,0 +1,68 @@
+import React from 'react';
+import { _cs } from '@togglecorp/fujs';
+
+import RawButton, { Props as RawButtonProps } from '../../RawButton';
+import { ymdToDateString, typedMemo } from '../../../utils/common.tsx';
+
+import styles from './styles.css';
+
+export interface Props {
+    className?: string;
+    year: number;
+    month: number;
+    date: number;
+    currentYear: number;
+    currentMonth: number;
+    activeDate?: string;
+    currentDate: number;
+    onClick?: (year: number, month: number, date: number) => void;
+    elementRef?: RawButtonProps<undefined>['elementRef'];
+    ghost?: boolean;
+}
+
+function CalendarDate(props: Props) {
+    const {
+        className,
+        year,
+        month,
+        date,
+        currentYear,
+        currentMonth,
+        currentDate,
+        onClick,
+        elementRef,
+        activeDate,
+        ghost,
+    } = props;
+
+    const handleClick = React.useCallback(() => {
+        if (onClick) {
+            onClick(year, month, date);
+        }
+    }, [year, month, date, onClick]);
+
+    const dateString = ymdToDateString(year, month, date);
+
+    return (
+        <RawButton
+            elementRef={elementRef}
+            name={date}
+            className={_cs(
+                styles.date,
+                year === currentYear
+                && month === currentMonth
+                && currentDate === date
+                && styles.today,
+                dateString === activeDate && styles.active,
+                ghost && styles.ghost,
+                className,
+            )}
+            onClick={handleClick}
+        >
+            {date}
+        </RawButton>
+
+    );
+}
+
+export default typedMemo(CalendarDate);

manager-dashboard/app/components/Calendar/CalendarDate/styles.css

@@ -0,0 +1,25 @@
+.date {
+    border-radius: 50%;
+    width: var(--width-calendar-date);
+    height: var(--width-calendar-date);
+
+    &.today {
+        color: var(--color-accent);
+        font-weight: var(--font-weight-bold);
+    }
+
+    &:hover {
+        background-color: var(--color-background-hover-light);
+    }
+
+    &.active {
+        background-color: var(--color-accent);
+        color: var(--color-text-on-dark);
+        pointer-events: none;
+    }
+
+    &.ghost {
+        opacity: 0.5;
+    }
+}
+