Feature/my map

symfony/fixtures/actors.yaml

@@ -10,6 +10,7 @@ App\Entity\Actor:
     administrativeScopes: '<numberBetween(1, 3)>x @administrative_scope_*'
     officeName: <companySuffix()>
     officeAddress: <address()>
+    geoData: '@geoData_<current()>'
     officeLocation: '<numberBetween(2, 13)>.<numberBetween(100000, 999999)>, <numberBetween(8, 16)>.<numberBetween(100000, 999999)>'
     contactName: <name()>
     contactPosition: <jobTitle()>

symfony/fixtures/resources.yaml

@@ -8,6 +8,7 @@ App\Entity\Resource:
     endAt: '<dateTimeBetween($startAt, $startAt)>'
     thematics: '<numberBetween(1, 3)>x @thematic_*'
     link: https://<domainName()>
+    geoData: '@geoData_<current()>'
     createdBy: '@user_*'
     isValidated: <boolean(70)>
-    author: <firstName()> <lastName()>
+    author: <firstName()> <lastName()>

symfony/migrations/Version20241213222822.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241213222822 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE actor ADD geo_data_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE actor ADD CONSTRAINT FK_447556F980E32C3E FOREIGN KEY (geo_data_id) REFERENCES geo_data (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_447556F980E32C3E ON actor (geo_data_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE actor DROP CONSTRAINT FK_447556F980E32C3E');
+        $this->addSql('DROP INDEX UNIQ_447556F980E32C3E');
+        $this->addSql('ALTER TABLE actor DROP geo_data_id');
+    }
+}

symfony/migrations/Version20241213223524.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241213223524 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE geo_data ALTER osm_id TYPE INT');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE geo_data ALTER osm_id TYPE BIGINT');
+    }
+}

symfony/migrations/Version20241213223750.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241213223750 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE geo_data ALTER osm_id TYPE BIGINT');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE geo_data ALTER osm_id TYPE INT');
+    }
+}

symfony/src/Entity/Actor.php

@@ -11,6 +11,7 @@
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Put;
 use App\Entity\Trait\BlameableEntity;
+use App\Entity\Trait\LocalizableEntity;
 use App\Entity\Trait\SluggableEntity;
 use App\Entity\Trait\TimestampableEntity;
 use App\Entity\Trait\ValidateableEntity;
@@ -67,12 +68,13 @@ class Actor
 {
     use TimestampableEntity;
     use SluggableEntity;
+    use LocalizableEntity;
     use BlameableEntity;
     use ValidateableEntity;
     public const ACTOR_READ_COLLECTION = 'actor:read_collection';
     public const ACTOR_READ_COLLECTION_ALL = 'actor:read_collection:all';
     public const ACTOR_READ_ITEM = 'actor:read_item';
-    private const ACTOR_WRITE = 'actor:write';
+    public const ACTOR_WRITE = 'actor:write';
 
     #[ORM\Id]
     #[ORM\Column(type: 'uuid', unique: true)]

symfony/src/Entity/GeoData.php

@@ -15,15 +15,15 @@ class GeoData
     private ?int $id = null;
 
     #[ORM\Column(type: 'bigint')]
-    #[Groups([Project::GET_FULL, Resource::GET_FULL])]
+    #[Groups([Project::GET_FULL, Resource::GET_FULL, Actor::ACTOR_READ_ITEM])]
     private ?int $osmId = null;
 
     #[ORM\Column]
-    #[Groups([Project::GET_FULL, Resource::GET_FULL])]
+    #[Groups([Project::GET_FULL, Resource::GET_FULL, Actor::ACTOR_READ_ITEM])]
     private ?string $osmType = 'node';
 
     #[ORM\Column(length: 255)]
-    #[Groups([PROJECT::GET_FULL, PROJECT::GET_PARTIAL, Actor::ACTOR_READ_ITEM, Resource::GET_FULL, Resource::WRITE])]
+    #[Groups([PROJECT::GET_FULL, PROJECT::GET_PARTIAL, Resource::GET_FULL, Resource::WRITE, Actor::ACTOR_READ_COLLECTION])]
     private ?string $name = null;
 
     #[ORM\Column(nullable: true)]
@@ -115,7 +115,7 @@ public function setAddress(?array $address): static
         return $this;
     }
 
-    #[Groups([Project::GET_PARTIAL])]
+    #[Groups([Project::GET_PARTIAL, Resource::GET_FULL, Actor::ACTOR_READ_COLLECTION])]
     public function getCoords(): ?array
     {
         return [

symfony/src/Entity/Thematic.php

@@ -35,7 +35,7 @@ class Thematic
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
-    #[Groups([self::THEMATIC_READ, Resource::GET_FULL, Project::GET_FULL, Project::GET_PARTIAL])]
+    #[Groups([self::THEMATIC_READ, Resource::GET_FULL, Actor::ACTOR_READ_COLLECTION, Project::GET_FULL, Project::GET_PARTIAL])]
     private ?int $id = null;
 
     #[ORM\Column(length: 255)]

symfony/src/Entity/Trait/LocalizableEntity.php

@@ -11,11 +11,11 @@
 
 trait LocalizableEntity
 {
-    #[Groups([Project::WRITE, Resource::WRITE])]
+    #[Groups([Project::WRITE, Resource::WRITE, Actor::ACTOR_WRITE])]
     private ?array $osmData = null;
 
     #[ORM\OneToOne(cascade: ['persist', 'remove'])]
-    #[Groups([Project::GET_FULL, Project::GET_PARTIAL, Actor::ACTOR_READ_ITEM, Resource::GET_FULL])]
+    #[Groups([Project::GET_FULL, Project::GET_PARTIAL, Actor::ACTOR_READ_ITEM, Actor::ACTOR_READ_COLLECTION, Resource::GET_FULL])]
     private ?GeoData $geoData = null;
 
     public function getOsmData(): ?array

vue/.env

@@ -0,0 +1 @@
+VITE_MAPTILER_API_KEY=0tupl15DKhXOvwp27x8c

vue/src/App.vue

@@ -1,25 +1,26 @@
 <template>
   <div class="App" :is-100-vh="appStore.is100vh" :is-light-header="appStore.isLightHeader">
-    <Header />
-    <KeepAlive>
-      <DialogController />
-    </KeepAlive>
-    <EditContentDialog />
-    <NotificationBox />
+    <Header v-if="!appStore.isFullViewport" />
     <div
       :class="
-        'App__content container ' +
+        'App__content ' +
+        (!appStore.isFullViewport ? 'container ' : '') +
         (appStore.mobile ? 'App__content--mobile' : 'App__content--desktop')
       "
     >
       <v-breadcrumbs
-        v-if="!appStore.mobile"
+        v-if="!appStore.mobile && !appStore.isFullViewport"
         class="Breadcrumbs"
         :items="appStore.breadcrumbs"
       ></v-breadcrumbs>
       <RouterView />
     </div>
-    <Footer />
+    <Footer v-if="!appStore.isFullViewport" />
+    <KeepAlive>
+      <DialogController />
+    </KeepAlive>
+    <EditContentDialog />
+    <NotificationBox />
   </div>
 </template>
 

vue/src/assets/styles/global/vars/_dimensions.scss

@@ -5,7 +5,7 @@ $header-mobile-height: 64px;
 $dim-container-w: 70rem;
 
 $dim-dialog-w: 31.25rem;
-$dim-radius: 5px;
+$dim-radius: 3px;
 
 // Breakpoints
 $bp-sm: 576px;

vue/src/assets/styles/global/vuetifyOverrides.scss

@@ -1,3 +1,13 @@
+:root {
+    --v-shadow-key-umbra-opacity: rgba(0, 0, 0, 0.1);
+    --v-shadow-key-penumbra-opacity: rgba(0, 0, 0, 0.075);
+    --v-shadow-key-ambient-opacity: rgba(0, 0, 0, 0.05);
+}
+
+.elevation-1 {
+    box-shadow: 0 0.125rem 0.25rem -0.125rem rgba(0, 0, 0, 0.15) !important;
+}
+
 // To be replaced by customized variables: https://vuetifyjs.com/en/features/sass-variables/#component-specific-variables
 .v-field--variant-solo, .v-field--variant-solo-filled {
     box-shadow: none !important;

vue/src/assets/translations/fr/common.json

@@ -55,6 +55,7 @@
         "cancel": "Annuler",
         "create": "Créer",
         "delete": "Supprimer",
+        "or": "OU",
         "errorMessages": {
             "required": "Ce champs est requis",
             "minlength": "Ce champs doit avoir au moins {min} caractères",

vue/src/assets/translations/fr/myMap.json

@@ -0,0 +1,37 @@
+{
+  "myMap": {
+    "header": {
+      "share": "Partager",
+      "search": {
+        "placeholder": "Rechercher un lieu ou une donnée"
+      }
+    },
+    "components": {
+      "opacity": "Transparence"
+    },
+    "leftSidebar": {
+      "welcome": {
+        "title": "Bienvenue",
+        "description": "Composez votre carte grâce aux données mises à disposition sur la Plateforme Urbaine du Cameroun.",
+        "moreAccess": "Vous souhaitez avoir accès à plus de données et d’outils ?",
+        "close": "Fermer"
+      }
+
+    },
+    "rightSidebar": {
+      "actions": {
+        "about": "À propos",
+        "share": "Partager",
+        "downloadLayer": "Télécharger la couche",
+        "opacity": "Ajuster la transparence"
+      },
+      "layers": {
+        "itemType": {
+          "project": "Projets",
+          "actor": "Acteurs",
+          "resource": "Ressources"
+        }
+      }
+    }
+  }
+}

vue/src/assets/translations/fr/resources.json

@@ -35,7 +35,6 @@
                 "edit": "Modifier une ressource",
                 "validate": "Valider une ressource"
             },
-            "or": "OU",
             "fields": {
                 "name": {
                     "label": "Nom de la ressource",

vue/src/components/forms/Geocoding.vue

@@ -4,17 +4,18 @@
     density="compact"
     featureType="city"
     variant="outlined"
-    :placeholder="$t('geocoding.placeholder')"
+    :placeholder="placeholder"
     :no-data-text="$t('geocoding.noData')"
     :items="geocodingItems"
     :clearable="true"
     :item-value="(val) => val"
     :item-title="(val) => val.osmName"
+    v-model="osmData"
     @update:search="(e) => (searchQuery = e)"
     @click:clear="(e) => (searchQuery = '')"
   >
     <template v-slot:prepend-inner>
-      <v-icon icon="mdi-map-marker-outline" color="main-blue" class="opacity-80"></v-icon>
+      <v-icon :icon="icon" color="main-blue" class="opacity-100"></v-icon>
     </template>
     <template v-slot:append-inner>
       <v-fade-transition>
@@ -37,13 +38,34 @@ import GeocodingService from '@/services/map/GeocodingService'
 import { debounce } from '@/services/utils/UtilsService'
 import { NominatimSearchType } from '@/models/enums/geo/NominatimSearchType'
 import type { GeocodingItem } from '@/models/interfaces/geo/GeocodingItem'
+import type { OsmData } from '@/models/interfaces/geo/OsmData'
+import { i18n } from '@/plugins/i18n'
+
+const osmData = defineModel<OsmData | null>({
+  default: null
+})
 
 const props = withDefaults(
   defineProps<{
     searchType: NominatimSearchType
+    icon?: string
+    geometryDetails?: boolean
+    placeholder?: string
   }>(),
   {
-    searchType: NominatimSearchType.FREE
+    searchType: NominatimSearchType.FREE,
+    icon: 'mdi-map-marker-outline',
+    geometryDetails: false,
+    placeholder: i18n.t('geocoding.placeholder')
+  }
+)
+
+watch(
+  () => osmData.value,
+  async () => {
+    if (osmData.value && props.geometryDetails) {
+      osmData.value = await GeocodingService.getBbox(osmData.value)
+    }
   }
 )