Changes for version 2.2.4

ubilabs · Apr 12, 2023 · 602f6e8 · 602f6e8
1 parent ee6a501
commit 602f6e8
Show file tree

Hide file tree

Showing 31 changed files with 16,844 additions and 277 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -14,7 +14,8 @@ The general procedure works as follows:
 5. Copy `config/drupal.database-settings.php`, `config/drupal.salt.inc.php` & `drupal/sites/default/files` back to its original locations
 6. Navigate to `YOURDOMAIN.TLD/drupal/admin/config/development/configuration`
 7. Scroll to the bottom and click *Import all*
-8. Navigate to `YOURDOMAIN.TLD/drupal/update.php`& follow the wizard
+8. Repeat step 7 (Reason: config_ignore settings may have been updated and necessary configuration updates may have been skipped in the first run)
+9. Navigate to `YOURDOMAIN.TLD/drupal/update.php`& follow the wizard
 
 ### From 2.0.0 or higher to 2.2.0
 **To update to this version some important steps are neccessary:**
@@ -35,46 +36,3 @@ The general procedure works as follows:
 There are new **required fields** *project owners* and *topics* which you will find in the dipas configuration form. You have to create data for these taxonomies. Details can be found here https://wiki.dipas.org/.
 
 For proceedings that need to edit appointments, go to the masterportal instance "Create-Appointment" and click edit then select the tab "Portal Settings". The checkmarks for "Center map at marker" and "'use setMarker' should be set to inactive (no checkmark)." You also need to do the following, under the Tool Plugins tab, set the "Drawing" tool to active (checkmark) and the "Drawing tool visible in the masterportal menu" setting to not active (no checkmark).
-
-**Masterportal Filter**
-
-If you want to use the filter for the masterportal, please add the following snippet to the menu settings of the Dipas instance under /admin/config/user-interface/masterportal/instances:
-
-```json
-[
-    {
-        "layerId": "contributions",
-        "strategy": "active",
-        "showHits": false,
-        "snippetTags": false,
-        "snippets": [
-          {
-            "type": "dropdown",
-            "attrName": "Thema",
-            "operator": "IN",
-            "display": "list",
-            "multiselect": true,
-            "addSelectAll": false,
-            "renderIcons": "fromLegend",
-            "info": false
-          }
-        ]
-    }
-]
-```
-
-### From 1.0.0 to 2.0.0
-
-The update of an exisiting DIPAS installation with version 1.0.0 is still in an experimental state.
-It has not yet been completely tested!
-
-Please have in mind the drupal update from drupal 8 to 9!
-This comes along with changed requirements for PHP and PostgreSQL!
-
-Follow these steps BEFORE starting the general update procedure
-
-0. **Backup** all files and the database to prevent data loss
-1. Navigate to `YOURDOMAIN.TLD/drupal/admin/modules/uninstall` and uninstall module "nimbus"
-2. Navigate to `YOURDOMAIN.TLD/drupal/admin/appearance` and uninstall theme "classy"
-3. Move your database from PostgreSQL 9 to PostgreSQL 13
-4. then go on and start the general update procedure
diff --git a/config/sync/core.entity_form_display.media.download.media_library.yml b/config/sync/core.entity_form_display.media.download.media_library.yml
@@ -26,7 +26,6 @@ hidden:
   field_domain_access: true
   field_domain_all_affiliates: true
   field_media_file: true
-  field_serve_for_documentation: true
   langcode: true
   path: true
   status: true

diff --git a/config/sync/core.entity_form_display.paragraph.image_with_text.default.yml b/config/sync/core.entity_form_display.paragraph.image_with_text.default.yml
@@ -1,4 +1,4 @@
-uuid: a95f5d0d-7bd8-41dc-b582-eeec2483e77a
+uuid: ccb8648f-f27d-4592-90d4-72b15efa043c
 langcode: en
 status: true
 dependencies:

diff --git a/config/sync/core.entity_view_display.paragraph.image_with_text.default.yml b/config/sync/core.entity_view_display.paragraph.image_with_text.default.yml
@@ -1,4 +1,4 @@
-uuid: f04def72-7945-49c8-b248-fd2bbe95fa29
+uuid: 3b210944-7c57-40b7-98d4-5d400c5ffd12
 langcode: en
 status: true
 dependencies:

diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
@@ -86,8 +86,8 @@ module:
   video_embed_field: 0
   votingapi: 0
   votingapi_widgets: 0
-  menu_link_content: 1
   vuejs: 0
+  menu_link_content: 1
   views: 10
   paragraphs: 11
   domain_dipas: 15

diff --git a/config/sync/field.field.paragraph.image_with_text.field_image.yml b/config/sync/field.field.paragraph.image_with_text.field_image.yml
@@ -1,4 +1,4 @@
-uuid: 563baa88-7504-4e9a-aee9-1ef22ea88706
+uuid: c565fb48-c3fd-472a-8fa1-8c3e77285a91
 langcode: en
 status: true
 dependencies:

diff --git a/config/sync/field.field.paragraph.image_with_text.field_image_position.yml b/config/sync/field.field.paragraph.image_with_text.field_image_position.yml
@@ -1,4 +1,4 @@
-uuid: 57bf83d0-2c04-47cf-ba11-4541e6211d20
+uuid: 03a3af5a-2e72-4094-b001-63e9a03be54c
 langcode: en
 status: true
 dependencies:

diff --git a/config/sync/field.field.paragraph.image_with_text.field_text.yml b/config/sync/field.field.paragraph.image_with_text.field_text.yml
@@ -1,4 +1,4 @@
-uuid: 560b2819-15a3-4bf3-a947-b19e15074fa8
+uuid: 6de5a520-33ec-424f-b47f-d42e6f2a10eb
 langcode: en
 status: true
 dependencies:

diff --git a/config/sync/field.settings.yml b/config/sync/field.settings.yml
@@ -1,4 +1,4 @@
-purge_batch_size: 50
 _core:
   default_config_hash: nJk0TAQBzlNo52ehiHI7bIEPLGi0BYqZvPdEn7Chfu0
 langcode: em
+purge_batch_size: 50
diff --git a/config/sync/field.storage.paragraph.field_image_position.yml b/config/sync/field.storage.paragraph.field_image_position.yml
@@ -1,4 +1,4 @@
-uuid: 83cd8895-43ed-4b45-a28e-80e96a653354
+uuid: 7fe25b00-eb0d-4d87-a2e2-6c138f6dc50e
 langcode: en
 status: true
 dependencies:

diff --git a/config/sync/language/de/masterportal.instance.default.appointment_create.yml b/config/sync/language/de/masterportal.instance.default.appointment_create.yml
@@ -7,5 +7,11 @@ settings:
       name: Werkzeuge
     legend:
       name: Legende
+    filter:
+      name: Kategorieauswahl
   SearchBarSettings:
     placeholder: 'Suche nach Adresse/Thema'
+  ToolSettings:
+    plugins:
+      Drupal\masterportal\Plugin\Masterportal\Tools\Draw:
+        name: 'Zeichnen / Schreiben'
diff --git a/config/sync/language/de/masterportal.instance.default.cockpit_map.yml b/config/sync/language/de/masterportal.instance.default.cockpit_map.yml
@@ -0,0 +1,17 @@
+label: 'Karteninstanz: DIPAS navigator'
+settings:
+  MenuSettings:
+    tree:
+      name: Themen
+    tools:
+      name: Werkzeuge
+    legend:
+      name: Legende
+    filter:
+      name: Kategorieauswahl
+  SearchBarSettings:
+    placeholder: 'Suche nach Adresse/Thema'
+  ToolSettings:
+    plugins:
+      Drupal\masterportal\Plugin\Masterportal\Tools\Gfi:
+        name: 'Informationen abfragen'
diff --git a/config/sync/language/de/masterportal.instance.default.default.yml b/config/sync/language/de/masterportal.instance.default.default.yml
@@ -9,6 +9,8 @@ settings:
       name: Kategorieauswahl
     legend:
       name: Legende
+  PortalSettings:
+    tooltip: 'Digitales Partizipationssystem'
   SearchBarSettings:
     placeholder: 'Suche nach Themen'
   ToolSettings:

diff --git a/config/sync/masterportal.config.basic.yml b/config/sync/masterportal.config.basic.yml
@@ -1,6 +1,6 @@
 langcode: en
 BasicSettings:
-  html_structure: "<!DOCTYPE html>\r\n<html lang=\"de\">\r\n    <head>\r\n      <meta charset=\"utf-8\">\r\n      <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\r\n      <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=0\">\r\n      <meta name=\"apple-mobile-web-app-capable\" content=\"yes\">\r\n      <meta name=\"mobile-web-app-capable\" content=\"yes\">\r\n      <title>Masterportal</title>\r\n      <link rel=\"stylesheet\" href=\"{{library_path}}/css/masterportal.css\">\r\n      <link rel=\"stylesheet\" href=\"{{library_path}}/css/fonts.css\">\r\n    </head>\r\n    <body>\r\n        <div id=\"masterportal-root\"></div>\r\n\r\n<div id=\"loader\" class=\"centered-box-wrapper loader-is-loading loader-is-initially-loading\">\r\n        <div class=\"centered-box-content\">\r\n            <div id=\"portal-logo-box\">\r\n                <div id=\"portal-logo-sub-title\">Dipas</div>\r\n            </div>\r\n            <div id=\"loader-spinner-itself\" class=\"default\"></div>\r\n        </div>\r\n        <div id=\"generic-masterportal-logo\"><img src=\"{{library_path}}/img/Logo_Masterportal.svg\"></div>\r\n    </div>\r\n    \r\n        <script type=\"text/javascript\" src=\"{{library_path}}/../cesium/1_84/Cesium.js\"></script>\r\n        <script type=\"text/javascript\" src=\"{{library_path}}/js/masterportal.js\"></script>\r\n    </body>\r\n</html>\r\n"
+  html_structure: "<!DOCTYPE html>\r\n<html lang=\"de\">\r\n    <head>\r\n      <meta charset=\"utf-8\">\r\n      <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\r\n      <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=0\">\r\n      <meta name=\"apple-mobile-web-app-capable\" content=\"yes\">\r\n      <meta name=\"mobile-web-app-capable\" content=\"yes\">\r\n      <title>Masterportal</title>\r\n      <link rel=\"stylesheet\" href=\"{{library_path}}/css/masterportal.css\">\r\n      <link rel=\"stylesheet\" href=\"{{library_path}}/css/fonts.css\">\r\n    </head>\r\n    <body>\r\n        <div id=\"masterportal-root\"></div>\r\n\r\n<div id=\"loader\" class=\"centered-box-wrapper loader-is-loading loader-is-initially-loading\">\r\n        <div class=\"centered-box-content\">\r\n            <div id=\"portal-logo-box\">\r\n                <div id=\"portal-logo-sub-title\">DIPAS</div>\r\n            </div>\r\n            <div id=\"loader-spinner-itself\" class=\"default\"></div>\r\n        </div>\r\n        <div id=\"generic-masterportal-logo\"><img src=\"{{library_path}}/img/Logo_Masterportal.svg\"></div>\r\n    </div>\r\n    \r\n        <script type=\"text/javascript\" src=\"{{base_path}}modules/custom/masterportal/libraries/cesium/1_95/Cesium.js\"></script>\r\n        <script type=\"text/javascript\" src=\"{{library_path}}/js/masterportal.js\"></script>\r\n    </body>\r\n</html>\r\n"
   js: |-
     {
         "ignoredKeys": [
@@ -120,15 +120,18 @@ BasicSettings:
         "startingMap3D": false,
         "obliqueMap": true,
         "cesiumParameter": {
-            "tileCacheSize": 20,
-            "enableLighting": true,
             "fog": {
                 "enabled": true,
                 "density": 0.0002,
                 "screenSpaceErrorFactor": 2
             },
             "maximumScreenSpaceError": 2,
-            "fxaa": true
+            "fxaa": false,
+            "globe": {
+                "enableLighting": true,
+                "maximumScreenSpaceError": 2,
+                "tileCacheSize": 20
+            }
         },
         "defaultToolId": "gfi",
         "portalLanguage": {
@@ -153,10 +156,10 @@ BasicSettings:
         },
         "useVectorStyleBeta": true,
         "extent": [
-            560000,
-            5850000,
-            625000,
-            6000000
+            485000,
+            5810000,
+            700000,
+            6080000
         ],
         "addons": [
             "dipas",

diff --git a/config/sync/masterportal.config.default.projections.yml b/config/sync/masterportal.config.default.projections.yml
@@ -48,3 +48,4 @@ MapProjections:
     -
       name: 'EPSG:4326'
       definition: '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'
+langcode: en
diff --git a/config/sync/masterportal.instance.default.appointment_create.yml b/config/sync/masterportal.instance.default.appointment_create.yml
@@ -67,21 +67,21 @@ settings:
     epsg: 'EPSG:25832'
   MenuSettings:
     tree:
-      name: Themen
+      name: Topics
       isInitOpen: false
     tools:
-      name: Werkzeuge
-    filterGeneral:
-      name: Kategorieauswahl
+      name: Tools
+    legend:
+      name: Legend
+    filter:
+      name: Category selection
       deactivateGFI: false
       isGeneric: false
       isInitOpen: false
       liveZoomToFeatures: false
       allowMultipleQueriesPerLayer: false
       isVisibleInMenu: false
       predefinedQueries: '[]'
-    legend:
-      name: Legende
   PortalSettings:
     title: Masterportal
     logo: ''
@@ -100,7 +100,7 @@ settings:
     minChars: 3
     zoomLevel: 9
     recommendedListlenth: 5
-    placeholder: 'Suche nach Adresse/Thema'
+    placeholder: 'Search for address/topic'
     renderToDOM: '#searchbarInMap'
     quickHelp: false
   ForegroundLayerSection:
@@ -110,7 +110,7 @@ settings:
       - Draw
     plugins:
       Drupal\masterportal\Plugin\Masterportal\Tools\Draw:
-        name: 'Zeichnen / Schreiben'
+        name: 'Draw / write'
         visibleInMenu: 0
-uid: '0'
+uid: 0
 hidden: false
diff --git a/config/sync/masterportal.instance.default.appointment_map.yml b/config/sync/masterportal.instance.default.appointment_map.yml
@@ -69,12 +69,12 @@ settings:
     epsg: 'EPSG:25832'
   MenuSettings:
     tree:
-      name: Themen
+      name: Topics
       isInitOpen: false
     tools:
-      name: Werkzeuge
+      name: Tools
     filter:
-      name: Kategorieauswahl
+      name: Category selection
       deactivateGFI: false
       isGeneric: false
       isInitOpen: false
@@ -96,7 +96,7 @@ settings:
             }
         ]
     legend:
-      name: Legende
+      name: Legend
   PortalSettings:
     title: Masterportal
     logo: ''
@@ -108,7 +108,7 @@ settings:
     minChars: 3
     zoomLevel: 9
     recommendedListlenth: 5
-    placeholder: 'Suche nach Adresse/Thema'
+    placeholder: 'Search for address/topic'
     renderToDOM: '#searchbarInMap'
     quickHelp: false
   SearchPluginSettings:
@@ -117,5 +117,5 @@ settings:
   ToolSettings:
     activePlugins: {  }
     plugins: {  }
-uid: '1'
+uid: 0
 hidden: false
diff --git a/config/sync/masterportal.instance.default.cockpit_map.yml b/config/sync/masterportal.instance.default.cockpit_map.yml
@@ -5,25 +5,25 @@ dependencies: {  }
 id: default.cockpit_map
 instance_name: cockpit_map
 domain: default
-label: 'Cockpit Map'
+label: 'DIPAS navigator Map'
 settings:
+  DesignSettings:
+    uiStyle: default
+    treeType: light
+    scaleLine: 0
+    simpleMap: 0
+    backgroundImage: '{{library_path}}/img/backgroundCanvas.jpeg'
   BackgroundLayerSettings:
     layer:
       -
         id: '453'
         custom:
           visibility: true
           gfiTheme: default
-  DesignSettings:
-    uiStyle: default
-    treeType: light
-    scaleLine: 0
-    simpleMap: 0
-    backgroundImage: '{{library_path}}/img/backgroundCanvas.jpeg'
-  ForegroundLayerSection:
-    layer: {  }
   MapSettings:
     startCenter: '[567929,5935026]'
+    twoFingerPan: true
+    useScaleOptions: false
     options:
       -
         resolution: 63.536412646199
@@ -69,45 +69,47 @@ settings:
     epsg: 'EPSG:25832'
   MenuSettings:
     tree:
-      name: Themen
+      name: Topics
       isInitOpen: false
     tools:
-      name: Werkzeuge
-    filterGeneral:
-      name: Kategorieauswahl
+      name: Tools
+    legend:
+      name: Legend
+    filter:
+      name: Category selection
       deactivateGFI: false
       isGeneric: false
       isInitOpen: false
       liveZoomToFeatures: false
       allowMultipleQueriesPerLayer: false
       isVisibleInMenu: false
       predefinedQueries: '[]'
-    legend:
-      name: Legende
   PortalSettings:
     title: ''
     logo: ''
     link: 'http://geoinfo.hamburg.de'
     tooltip: 'Landesbetrieb Geoinformation und Vermessung'
     activePlugins: {  }
     plugins: {  }
+  SearchPluginSettings:
+    activePlugins: {  }
+    plugins: {  }
   SearchBarSettings:
     minChars: 3
     zoomLevel: 9
     recommendedListlenth: 5
-    placeholder: 'Suche nach Adresse/Thema'
+    placeholder: 'Search for address/topic'
     renderToDOM: '#searchbarInMap'
     quickHelp: false
-  SearchPluginSettings:
-    activePlugins: {  }
-    plugins: {  }
+  ForegroundLayerSection:
+    layer: {  }
   ToolSettings:
     activePlugins:
       - Gfi
     plugins:
       Drupal\masterportal\Plugin\Masterportal\Tools\Gfi:
-        name: 'Informationen abfragen'
+        name: 'Query information'
         active: true
         isVisibleInMenu: false
-uid: '1'
+uid: 0
 hidden: false