Merge pull request #39 from helsingborg-stad/fix/osm-filtering

fix: osm filtering
helsingborg-stad · Jun 19, 2024 · 5b32ee9 · 5b32ee9
2 parents 1d43a12 + 700e756
commit 5b32ee9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/source/php/App.php b/source/php/App.php
@@ -28,8 +28,8 @@ public function postTypes($field)
         $postTypes = get_post_types();
         $arr = [];
         foreach ($postTypes as $postType) {
-            $schemaType = get_field('schema', $postType . '_options');
-            if ($schemaType === 'Place') {
+            $contentType = \Municipio\Helper\ContentType::getContentType($postType);
+            if (is_object($contentType) && $contentType->getKey() == 'place') {
                 $postTypeObject = get_post_type_object($postType);
                 $arr[$postTypeObject->name] = $postTypeObject->label;
             }

diff --git a/source/php/Module/OpenStreetMap.php b/source/php/Module/OpenStreetMap.php
@@ -49,21 +49,18 @@ public function replaceArchivePosts($item)
     public function data(): array
     {
         $fields = get_fields($this->ID);
-        $secondaryQuery = get_query_var('secondaryQuery');
         $data['ID'] = !empty($this->ID) ? $this->ID : uniqid();
 
-        if (empty($secondaryQuery)) {
-            $termsToShow = $fields['mod_osm_terms_to_show'];
-            $postTypeToShow = $fields['mod_osm_post_type'];
-            $taxonomyToShow = [];
-            foreach ($termsToShow as $term) {
-                $taxonomy = get_term($term)->taxonomy;
-                $taxonomyToShow[$taxonomy][] = $term;
-            }
-            $places = $this->getPlacePosts($termsToShow, $taxonomyToShow, $postTypeToShow);
-        } else {
-            $places = $secondaryQuery->posts;
+        $termsToShow = $fields['mod_osm_terms_to_show'];
+        $postTypeToShow = $fields['mod_osm_post_type'];
+        $taxonomyToShow = [];
+
+        foreach ($termsToShow as $term) {
+            $taxonomy = get_term($term)->taxonomy;
+            $taxonomyToShow[$taxonomy][] = $term;
         }
+        $places = $this->getPlacePosts($termsToShow, $taxonomyToShow, $postTypeToShow);
+
         $data['isFullWidth'] = $fields['mod_osm_full_width'] ?? false;
         $data['places'] = $places;
         $data['mapStyle'] = $this->getMapStyle();

diff --git a/source/php/Module/views/partials/collection.blade.php b/source/php/Module/views/partials/collection.blade.php
@@ -3,7 +3,7 @@
     'containerAware' => true,
     'bordered' => true,
     'attributeList' => [
-        'data-js-map-location' => !empty($place->openStreetMapData['pin']) ? json_encode($place->openStreetMapData['pin']) : "",
+        'data-js-map-location' => !empty($place->schemaData['place']['pin']) ? json_encode($place->schemaData['place']['pin']) : "", 
     ]
 ])
 @if (!empty($place->callToActionItems['floating']))