diff --git a/j4/pkg_agosms/src/modules/mod_agosmsmt/mod_agosmsmt.php b/j4/pkg_agosms/src/modules/mod_agosmsmt/mod_agosmsmt.php index d507782a..fe107d4c 100644 --- a/j4/pkg_agosms/src/modules/mod_agosmsmt/mod_agosmsmt.php +++ b/j4/pkg_agosms/src/modules/mod_agosmsmt/mod_agosmsmt.php @@ -23,10 +23,10 @@ require_once(JPATH_SITE.'/components/com_mtree/listlisting.php'); $savant = new Savant2([ - 'template_path' => JPATH_SITE.'/components/com_mtree/templates/'.$mtconf->get('template').'/', - 'template_path_default' => JPATH_SITE.'/components/com_mtree/Savant2/default/', - 'plugin_path' => JPATH_SITE.'/components/com_mtree/Savant2/', - 'filter_path' => JPATH_SITE.'/components/com_mtree/Savant2/' + 'template_path' => JPATH_SITE.'/components/com_mtree/templates/'.$mtconf->get('template').'/', + 'template_path_default' => JPATH_SITE.'/components/com_mtree/Savant2/default/', + 'plugin_path' => JPATH_SITE.'/components/com_mtree/Savant2/', + 'filter_path' => JPATH_SITE.'/components/com_mtree/Savant2/' ]); $count = $params->get('count', 50); @@ -40,9 +40,9 @@ $listListing->setLimit($count); $links = $listListing->getListings(); -if(empty($links)) { - require ModuleHelper::getLayoutPath('mod_mt_map', '_emptystate'); - return; +if (empty($links)) { + require ModuleHelper::getLayoutPath('mod_mt_map', '_emptystate'); + return; } $map = Map::assign($savant)->withListings($links)->withConfig($mtconf); @@ -51,50 +51,45 @@ // AGOSM -$arrCats = array(); +$arrCats = []; -if( !empty($links) ) -{ - foreach ($links AS $link) - { - if(!in_array($link->cat_name, $arrCats, true)){ - array_push($arrCats, $link->cat_name); - } - } +if (!empty($links)) { + foreach ($links as $link) { + if (!in_array($link->cat_name, $arrCats, true)) { + array_push($arrCats, $link->cat_name); + } + } } -$geojson = array( - 'type' => 'FeatureCollection', - 'features' => array() -); - -if( !empty($links) ) -{ - $Itemid = \MTModuleHelper::getItemid(); - - foreach ($links AS $link) - { - if( $link->lng != 0 && $link->lat != 0 ) - { - $feature = array( - 'id' => $link->link_id, - 'type' => 'Feature', - 'geometry' => array( - 'type' => 'Point', - 'coordinates' => array($link->lng, $link->lat) - ), - - 'properties' => array( - 'link_name' => json_encode($link->link_name), - 'link_desc' => json_encode($link->link_desc), - 'route' => '\'' . Route::_('index.php?option=com_mtree&task=viewlink&link_id='.$link->link_id.'&Itemid='.$Itemid) . '\'', - 'cat_name' => json_encode($link->cat_name), - 'cat_id' => json_encode($link->cat_id) - ) - ); - array_push($geojson['features'], $feature); - } - } +$geojson = [ + 'type' => 'FeatureCollection', + 'features' => [] +]; + +if (!empty($links)) { + $Itemid = \MTModuleHelper::getItemid(); + + foreach ($links as $link) { + if ($link->lng != 0 && $link->lat != 0) { + $feature = [ + 'id' => $link->link_id, + 'type' => 'Feature', + 'geometry' => [ + 'type' => 'Point', + 'coordinates' => [$link->lng, $link->lat] + ], + + 'properties' => [ + 'link_name' => json_encode($link->link_name), + 'link_desc' => json_encode($link->link_desc), + 'route' => '\'' . Route::_('index.php?option=com_mtree&task=viewlink&link_id='.$link->link_id.'&Itemid='.$Itemid) . '\'', + 'cat_name' => json_encode($link->cat_name), + 'cat_id' => json_encode($link->cat_id) + ] + ]; + array_push($geojson['features'], $feature); + } + } } @@ -198,4 +193,4 @@ /* [192] => stdClass Object ( [link_id] => 298 [link_name] => Fischzucht Rameil GbR [alias] => hoflaeden [link_desc] => In fünfter Generation betreibt die Familie Rameil die Aufzucht und Vermarktung von Forellen, Lachsforellen, Saiblingen, Stören und Karpfen. Neben unseren heimischen Fischen bieten wir auch Seefisch an, den wir direkt über Bremerhaven beziehen. Sie finden bei uns frischen, geräucherten und marinierten Fisch. [user_id] => 166 [link_hits] => 1 [link_votes] => 0 [link_rating] => 0.000000 [link_featured] => 0 [link_published] => 1 [link_approved] => 1 [link_template] => [attribs] => use_map= show_print= show_recommend= show_rating= show_review= show_visit= show_contact= show_report= show_ownerlisting= [metakey] => Hofladen [metadesc] => Hofläden bei regional-optimal.de [internal_notes] => [ordering] => 6 [link_created] => 2022-03-05 16:56:49 [publish_up] => 2022-03-05 16:56:49 [publish_down] => 0000-00-00 00:00:00 [link_modified] => 2022-03-05 16:58:51 [link_visited] => 0 [firstname] => [lastname] => [address] => Pipprichsweg 9 [city] => Fritzlar [state] => [country] => Deutschland [postcode] => 34560 [contactperson] => [telephone] => 056221685 [mobile] => [fax] => [email] => fischzucht-rameil@t-online.de [website] => https://fischzucht-rameil.de/ [year] => [date] => [price] => [show_map] => 1 [lat] => 51.11956 [lng] => 9.25529 [zoom] => 13 [tlcat_id] => 106 [tlcat_name] => Anbieter [cat_id] => 98 [cat_name] => Hofläden [title] => [cat_desc] => [cat_parent] => 106 [cat_links] => 270 [cat_cats] => 0 [cat_featured] => 0 [cat_image] => 98_hofladen.jpg [cat_association] => [cat_published] => 1 [cat_created] => 2012-11-14 16:57:34 [cat_approved] => 1 [cat_template] => [cat_usemainindex] => 0 [cat_allow_submission] => 1 [cat_show_listings] => 1 [metadata] => [lft] => 15 [rgt] => 16 [username] => maj [owner] => maj [owner_email] => mjanzer@arcor.de [link] => /kunden/regional/index.php/component/mtree/fischzucht-rameil-gbr?Itemid=319 [image_path] => [trimmed_website] => https://fischzucht-rameil.de/ [cat_link] => /kunden/regional/index.php/component/mtree/?Itemid=319 ) -*/ \ No newline at end of file +*/ diff --git a/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/_emptystate.php b/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/_emptystate.php index 128bced1..193fab62 100644 --- a/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/_emptystate.php +++ b/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/_emptystate.php @@ -4,9 +4,9 @@ use Joomla\CMS\Language\Text; ?>
- -

-
-

-
+ +

+
+

+
\ No newline at end of file diff --git a/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/default.php b/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/default.php index 60197ff4..d1eba264 100644 --- a/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/default.php +++ b/j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/default.php @@ -20,12 +20,12 @@ width:auto; height:get('height', '400'); ?>get('heightunit', 'px'); ?>;" - data-module-id="id; ?>" data-addprivacybox="get('addprivacybox', '0') ?>" - data-unique='' data-no-world-warp="get('noWorldWarp', 0); ?>" - data-detect-retina="get('detectRetina', 0); ?>" - data-baselayer="get('baselayer', 'mapnik'); ?>" - data-lonlat="get('lonlat', '50.281168, 7.276211'); ?>" - data-zoom="get('zoom', '10'); ?>" data-locate="get('showlocate', false); ?>" + data-module-id="id; ?>" data-addprivacybox="get('addprivacybox', '0') ?>" + data-unique='' data-no-world-warp="get('noWorldWarp', 0); ?>" + data-detect-retina="get('detectRetina', 0); ?>" + data-baselayer="get('baselayer', 'mapnik'); ?>" + data-lonlat="get('lonlat', '50.281168, 7.276211'); ?>" + data-zoom="get('zoom', '10'); ?>" data-locate="get('showlocate', false); ?>" data-show-radiusZoom="get('show_radiusZoom', false); ?>" data-showfullscreenlink="get('showfullscreenlink', false); ?>" @@ -35,39 +35,44 @@ data-use-own-marker-image="get('use_own_marker_image', false); ?>" data-fullscreen="get('showfullscreen', false); ?>" - data-mouseposition="get('showmouseposition', false); ?>" - get('baselayer', 'mapbox')) : ?> - data-mapboxmaptype="get('mapboxmaptype', 'mapbox/streets-v11'); ?>" - data-mapboxkey="get('mapboxkey', ''); ?>" - get('baselayer', 'thunderforest')) : ?> - data-thunderforestkey="get('thunderforestkey', ''); ?>" - data-thunderforestmaptype="get('thunderforestmaptype', 'cycle'); ?>" - get('baselayer', 'stamen')) : ?> - data-stamenmaptype="get('stamenmaptype', 'watercolor'); ?>" - get('baselayer', 'google')) : ?> - data-googlemapstype="get('googlemapstype', 'satellite'); ?>" - get('baselayer', 'custom')) : ?> - data-customBaselayer="get('customBaselayer', 'maxZoom: 18,'); ?>" - data-customBaselayerURL="get('customBaselayerURL', 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'); ?>" - get('scale') !== null) : ?> - data-scale="get('scale')); ?>" - data-scale-metric="get('scale', $defaultArray)); ?>" - data-scale-imperial="get('scale', $defaultArray)); ?>" - data-showrouting-simple="get('showrouting_simple', '1'); ?>" - data-mtmarkers="" - data-arrCats="" - data-scrollwheelzoom='get('scrollwheelzoom', '') ?>' - data-owngooglegesturetext='get('owngooglegesturetext', '1') ?>' - data-scroll='' - data-touch='' - data-scrollmac='' - data-uriroot='' class="leafletmapMod" id="mapid; ?>"> + data-mouseposition="get('showmouseposition', false); ?>" + get('baselayer', 'mapbox')) : ?> + data-mapboxmaptype="get('mapboxmaptype', 'mapbox/streets-v11'); ?>" + data-mapboxkey="get('mapboxkey', ''); ?>" + get('baselayer', 'thunderforest')) : ?> + data-thunderforestkey="get('thunderforestkey', ''); ?>" + data-thunderforestmaptype="get('thunderforestmaptype', 'cycle'); ?>" + get('baselayer', 'stamen')) : ?> + data-stamenmaptype="get('stamenmaptype', 'watercolor'); ?>" + get('baselayer', 'google')) : ?> + data-googlemapstype="get('googlemapstype', 'satellite'); ?>" + get('baselayer', 'custom')) : ?> + data-customBaselayer="get('customBaselayer', 'maxZoom: 18,'); ?>" + data-customBaselayerURL="get('customBaselayerURL', 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'); ?>" + get('scale') !== null) : ?> + data-scale="get('scale')); ?>" + data-scale-metric="get('scale', $defaultArray)); ?>" + data-scale-imperial="get('scale', $defaultArray)); ?>" + data-showrouting-simple="get('showrouting_simple', '1'); ?>" + data-mtmarkers="" + data-arrCats="" + data-scrollwheelzoom='get('scrollwheelzoom', '') ?>' + data-owngooglegesturetext='get('owngooglegesturetext', '1') ?>' + data-scroll='' + data-touch='' + data-scrollmac='' + data-uriroot='' class="leafletmapMod" id="mapid; ?>"> get('addprivacybox', '0')) : ?>

@@ -77,14 +82,14 @@