Switch to location-plugin with map for address variables

lblod · Jun 11, 2024 · 5a142bc · 5a142bc
1 parent 104f1ed
commit 5a142bc
Show file tree

Hide file tree

Showing 8 changed files with 1,124 additions and 28 deletions.
diff --git a/.changeset/silly-needles-admire.md b/.changeset/silly-needles-admire.md
@@ -0,0 +1,5 @@
+---
+'frontend-gelinkt-notuleren': minor
+---
+
+Switch to new location-plugin for addresses, including functionality to choose geographic locations from a map
diff --git a/app/controllers/agendapoints/edit.js b/app/controllers/agendapoints/edit.js
@@ -30,8 +30,6 @@ import {
 } from '@lblod/ember-rdfa-editor/plugins/table';
 import { STRUCTURE_NODES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/article-structure-plugin/structures';
 import {
-  address,
-  addressView,
   date,
   dateView,
   codelist,
@@ -43,6 +41,10 @@ import {
   text_variable,
   textVariableView,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
+import {
+  osloLocation,
+  osloLocationView,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
 import {
   bulletListWithConfig,
   listItemWithConfig,
@@ -127,7 +129,7 @@ export default class AgendapointsEditController extends Controller {
       templateComment,
       text_variable,
       number,
-      address,
+      oslo_location: osloLocation(this.config.location),
       location,
       codelist,
       ...besluitNodes,
@@ -184,7 +186,7 @@ export default class AgendapointsEditController extends Controller {
         },
         endpoint: '/codex/sparql',
         decisionsEndpoint: ENV.publicatieEndpoint,
-        defaultDecisionsGovernmentName: municipality?.naam,
+        defaultDecisionsGovernmentName: municipality.naam,
       },
       link: {
         interactive: true,
@@ -203,11 +205,19 @@ export default class AgendapointsEditController extends Controller {
       structures: structureSpecs,
       worship: {
         endpoint: 'https://data.lblod.info/sparql',
-        defaultAdministrativeUnit: municipality && {
+        defaultAdministrativeUnit: municipality.uri && {
           label: municipality.naam,
           uri: municipality.uri,
         },
       },
+      location: {
+        defaultPointUriRoot:
+          'https://publicatie.gelinkt-notuleren.vlaanderen.be/id/geometrie/',
+        defaultPlaceUriRoot:
+          'https://publicatie.gelinkt-notuleren.vlaanderen.be/id/plaats/',
+        defaultAddressUriRoot:
+          'https://publicatie.gelinkt-notuleren.vlaanderen.be/id/adres/',
+      },
     };
   }
 
@@ -216,7 +226,8 @@ export default class AgendapointsEditController extends Controller {
     if (classificatie?.uri === GEMEENTE || classificatie?.uri === OCMW) {
       return this.currentSession.group;
     } else {
-      return null;
+      // Return empty object instead of null so can be used safely in template
+      return {};
     }
   }
 
@@ -240,7 +251,7 @@ export default class AgendapointsEditController extends Controller {
         regulatoryStatementNode: regulatoryStatementNodeView(controller),
         link: linkView(this.config.link)(controller),
         image: imageView(controller),
-        address: addressView(controller),
+        oslo_location: osloLocationView(this.config.location)(controller),
         date: dateView(this.config.date)(controller),
         number: numberView(controller),
         text_variable: textVariableView(controller),

diff --git a/app/controllers/regulatory-statements/edit.js b/app/controllers/regulatory-statements/edit.js
@@ -68,8 +68,6 @@ import { color } from '@lblod/ember-rdfa-editor/plugins/color/marks/color';
 import { undo } from '@lblod/ember-rdfa-editor/plugins/history';
 import { getActiveEditableNode } from '@lblod/ember-rdfa-editor/plugins/_private/editable-node';
 import {
-  address,
-  addressView,
   codelist,
   codelistView,
   date,
@@ -81,6 +79,10 @@ import {
   text_variable,
   textVariableView,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
+import {
+  osloLocation,
+  osloLocationView,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
 import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
 import {
   tableOfContentsView,
@@ -133,7 +135,7 @@ export default class RegulatoryStatementsRoute extends Controller {
       date: date(this.config.date),
       codelist,
       location,
-      address,
+      oslo_location: osloLocation(this.config.location),
       number,
       text_variable,
       ...STRUCTURE_NODES,
@@ -169,7 +171,7 @@ export default class RegulatoryStatementsRoute extends Controller {
         ),
         link: linkView(this.config.link)(controller),
         image: imageView(controller),
-        address: addressView(controller),
+        oslo_location: osloLocationView(this.config.location)(controller),
         date: dateView(this.config.date)(controller),
         number: numberView(controller),
         location: locationView(controller),
@@ -251,14 +253,22 @@ export default class RegulatoryStatementsRoute extends Controller {
       structures: STRUCTURE_SPECS,
       worship: {
         endpoint: 'https://data.lblod.info/sparql',
-        defaultAdministrativeUnit: municipality && {
+        defaultAdministrativeUnit: municipality.uri && {
           label: municipality.naam,
           uri: municipality.uri,
         },
       },
       snippet: {
         endpoint: ENV.regulatoryStatementEndpoint,
       },
+      location: {
+        defaultPointUriRoot:
+          'https://publicatie.gelinkt-notuleren.vlaanderen.be/id/geometrie/',
+        defaultPlaceUriRoot:
+          'https://publicatie.gelinkt-notuleren.vlaanderen.be/id/plaats/',
+        defaultAddressUriRoot:
+          'https://publicatie.gelinkt-notuleren.vlaanderen.be/id/adres/',
+      },
     };
   }
 
@@ -307,7 +317,8 @@ export default class RegulatoryStatementsRoute extends Controller {
     if (classificatie?.uri === GEMEENTE || classificatie?.uri === OCMW) {
       return this.currentSession.group;
     } else {
-      return null;
+      // Return empty object instead of null so can be used safely in template
+      return {};
     }
   }
 

diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -41,6 +41,7 @@
 @import 'confidentiality-plugin';
 @import 'worship-plugin';
 @import 'snippet-plugin';
+@import 'location-plugin';
 @import 'project/p-annotations'; // @TODO: refactor in ember-rdfa-editor
 
 // give treatment (behandeling) content the same style as other say-documents

diff --git a/app/templates/agendapoints/edit.hbs b/app/templates/agendapoints/edit.hbs
@@ -153,7 +153,11 @@
         />
       {{/if}}
       <TemplateCommentsPlugin::Insert @controller={{this.controller}} />
-      <VariablePlugin::Address::Insert @controller={{this.controller}} />
+      <LocationPlugin::Insert
+        @controller={{this.controller}}
+        @defaultMunicipality={{this.defaultMunicipality.naam}}
+        @config={{this.config.location}}
+      />
       <WorshipPlugin::Insert
         @controller={{this.controller}}
         @config={{this.config.worship}}
@@ -183,10 +187,6 @@
         @controller={{this.controller}}
         @options={{this.locationEditOptions}}
       />
-      <VariablePlugin::Address::Edit
-        @controller={{this.controller}}
-        @defaultMunicipality={{this.defaultMunicipality.naam}}
-      />
       <TemplateCommentsPlugin::EditCard @controller={{this.controller}} />
     </:sidebar>
   </RdfaEditorContainer>

diff --git a/app/templates/regulatory-statements/edit.hbs b/app/templates/regulatory-statements/edit.hbs
@@ -143,7 +143,11 @@
         @templates={{this.model.standardTemplates}}
       />
       <TemplateCommentsPlugin::Insert @controller={{this.controller}} />
-      <VariablePlugin::Address::Insert @controller={{this.controller}} />
+      <LocationPlugin::Insert
+        @controller={{this.controller}}
+        @defaultMunicipality={{this.defaultMunicipality.naam}}
+        @config={{this.config.location}}
+      />
       <WorshipPlugin::Insert
         @controller={{this.controller}}
         @config={{this.config.worship}}
@@ -171,10 +175,6 @@
         @controller={{this.controller}}
         @options={{this.locationEditOptions}}
       />
-      <VariablePlugin::Address::Edit
-        @controller={{this.controller}}
-        @defaultMunicipality={{this.defaultMunicipality.naam}}
-      />
       <TemplateCommentsPlugin::EditCard @controller={{this.controller}} />
     </:sidebar>
   </RdfaEditorContainer>