Skip to content
This repository has been archived by the owner on Jan 13, 2023. It is now read-only.

Commit

Permalink
cs
Browse files Browse the repository at this point in the history
  • Loading branch information
@astridx
astridx committed Apr 1, 2022
1 parent 5b63399 commit 61376e0
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 97 deletions.
93 changes: 44 additions & 49 deletions j4/pkg_agosms/src/modules/mod_agosmsmt/mod_agosmsmt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
}
}
}


Expand Down Expand Up @@ -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 )
*/
*/
10 changes: 5 additions & 5 deletions j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/_emptystate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
use Joomla\CMS\Language\Text;
?>
<div class="px-4 py-5 my-5 text-center bg-light bg-gradient">
<span class="fa-6x mb-4 far fa-map text-muted" aria-hidden="true"></span>
<h2 class="display-7 fw-bold text-secondary"><?=Text::_('MOD_MT_MAP_EMPTY_MAP')?></h2>
<div class="mt-3">
<p class="mb-4 text-muted"><?=Text::_('MOD_MT_MAP_EMPTY_MAP_DESC')?></p>
</div>
<span class="fa-6x mb-4 far fa-map text-muted" aria-hidden="true"></span>
<h2 class="display-7 fw-bold text-secondary"><?=Text::_('MOD_MT_MAP_EMPTY_MAP')?></h2>
<div class="mt-3">
<p class="mb-4 text-muted"><?=Text::_('MOD_MT_MAP_EMPTY_MAP_DESC')?></p>
</div>
</div>
89 changes: 47 additions & 42 deletions j4/pkg_agosms/src/modules/mod_agosmsmt/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
width:auto;
height:<?php echo $params->get('height', '400'); ?><?php echo $params->get('heightunit', 'px'); ?>;"

data-module-id="<?php echo $module->id; ?>" data-addprivacybox="<?php echo $params->get('addprivacybox', '0') ?>"
data-unique='<?php echo $unique ?>' data-no-world-warp="<?php echo $params->get('noWorldWarp', 0); ?>"
data-detect-retina="<?php echo $params->get('detectRetina', 0); ?>"
data-baselayer="<?php echo $params->get('baselayer', 'mapnik'); ?>"
data-lonlat="<?php echo $params->get('lonlat', '50.281168, 7.276211'); ?>"
data-zoom="<?php echo $params->get('zoom', '10'); ?>" data-locate="<?php echo $params->get('showlocate', false); ?>"
data-module-id="<?php echo $module->id; ?>" data-addprivacybox="<?php echo $params->get('addprivacybox', '0') ?>"
data-unique='<?php echo $unique ?>' data-no-world-warp="<?php echo $params->get('noWorldWarp', 0); ?>"
data-detect-retina="<?php echo $params->get('detectRetina', 0); ?>"
data-baselayer="<?php echo $params->get('baselayer', 'mapnik'); ?>"
data-lonlat="<?php echo $params->get('lonlat', '50.281168, 7.276211'); ?>"
data-zoom="<?php echo $params->get('zoom', '10'); ?>" data-locate="<?php echo $params->get('showlocate', false); ?>"

data-show-radiusZoom="<?php echo $params->get('show_radiusZoom', false); ?>"
data-showfullscreenlink="<?php echo $params->get('showfullscreenlink', false); ?>"
Expand All @@ -35,39 +35,44 @@
data-use-own-marker-image="<?php echo $params->get('use_own_marker_image', false); ?>"

data-fullscreen="<?php echo $params->get('showfullscreen', false); ?>"
data-mouseposition="<?php echo $params->get('showmouseposition', false); ?>"
<?php if ($params->get('baselayer', 'mapbox')) : ?>
data-mapboxmaptype="<?php echo $params->get('mapboxmaptype', 'mapbox/streets-v11'); ?>"
data-mapboxkey="<?php echo $params->get('mapboxkey', ''); ?>" <?php endif; ?>
<?php if ($params->get('baselayer', 'thunderforest')) : ?>
data-thunderforestkey="<?php echo $params->get('thunderforestkey', ''); ?>"
data-thunderforestmaptype="<?php echo $params->get('thunderforestmaptype', 'cycle'); ?>" <?php endif; ?>
<?php if ($params->get('baselayer', 'stamen')) : ?>
data-stamenmaptype="<?php echo $params->get('stamenmaptype', 'watercolor'); ?>" <?php endif; ?>
<?php if ($params->get('baselayer', 'google')) : ?>
data-googlemapstype="<?php echo $params->get('googlemapstype', 'satellite'); ?>" <?php endif; ?>
<?php if ($params->get('baselayer', 'custom')) : ?>
data-customBaselayer="<?php echo $params->get('customBaselayer', 'maxZoom: 18,'); ?>"
data-customBaselayerURL="<?php echo $params->get('customBaselayerURL', 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'); ?>"
<?php endif; ?> <?php if ($params->get('scale') !== null) : ?>
data-scale="<?php echo count($params->get('scale')); ?>" <?php endif; ?>
data-scale-metric="<?php echo in_array('metric', $params->get('scale', $defaultArray)); ?>"
data-scale-imperial="<?php echo in_array('imperial', $params->get('scale', $defaultArray)); ?>"
data-showrouting-simple="<?php echo $params->get('showrouting_simple', '1'); ?>"
data-mtmarkers="<?php echo htmlspecialchars(json_encode($geojson), ENT_QUOTES, 'UTF-8'); ?>"
data-arrCats="<?php echo htmlspecialchars(json_encode($arrCats), ENT_QUOTES, 'UTF-8'); ?>"
data-scrollwheelzoom='<?php echo $params->get('scrollwheelzoom', '') ?>'
data-owngooglegesturetext='<?php echo $params->get('owngooglegesturetext', '1') ?>'
data-scroll='<?php echo JText::_('PLG_AGOSMSADDRESSMARKER_SCROLL'); ?>'
data-touch='<?php echo JText::_('PLG_AGOSMSADDRESSMARKER_TOUCH'); ?>'
data-scrollmac='<?php echo JText::_('PLG_AGOSMSADDRESSMARKER_SCROLLMAC'); ?>'
data-uriroot='<?php echo JUri::root(); ?>' class="leafletmapMod" id="map<?php echo $module->id; ?>">
data-mouseposition="<?php echo $params->get('showmouseposition', false); ?>"
<?php if ($params->get('baselayer', 'mapbox')) : ?>
data-mapboxmaptype="<?php echo $params->get('mapboxmaptype', 'mapbox/streets-v11'); ?>"
data-mapboxkey="<?php echo $params->get('mapboxkey', ''); ?>" <?php
endif; ?>
<?php if ($params->get('baselayer', 'thunderforest')) : ?>
data-thunderforestkey="<?php echo $params->get('thunderforestkey', ''); ?>"
data-thunderforestmaptype="<?php echo $params->get('thunderforestmaptype', 'cycle'); ?>" <?php
endif; ?>
<?php if ($params->get('baselayer', 'stamen')) : ?>
data-stamenmaptype="<?php echo $params->get('stamenmaptype', 'watercolor'); ?>" <?php
endif; ?>
<?php if ($params->get('baselayer', 'google')) : ?>
data-googlemapstype="<?php echo $params->get('googlemapstype', 'satellite'); ?>" <?php
endif; ?>
<?php if ($params->get('baselayer', 'custom')) : ?>
data-customBaselayer="<?php echo $params->get('customBaselayer', 'maxZoom: 18,'); ?>"
data-customBaselayerURL="<?php echo $params->get('customBaselayerURL', 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'); ?>"
<?php endif; ?> <?php if ($params->get('scale') !== null) : ?>
data-scale="<?php echo count($params->get('scale')); ?>" <?php
endif; ?>
data-scale-metric="<?php echo in_array('metric', $params->get('scale', $defaultArray)); ?>"
data-scale-imperial="<?php echo in_array('imperial', $params->get('scale', $defaultArray)); ?>"
data-showrouting-simple="<?php echo $params->get('showrouting_simple', '1'); ?>"
data-mtmarkers="<?php echo htmlspecialchars(json_encode($geojson), ENT_QUOTES, 'UTF-8'); ?>"
data-arrCats="<?php echo htmlspecialchars(json_encode($arrCats), ENT_QUOTES, 'UTF-8'); ?>"
data-scrollwheelzoom='<?php echo $params->get('scrollwheelzoom', '') ?>'
data-owngooglegesturetext='<?php echo $params->get('owngooglegesturetext', '1') ?>'
data-scroll='<?php echo JText::_('PLG_AGOSMSADDRESSMARKER_SCROLL'); ?>'
data-touch='<?php echo JText::_('PLG_AGOSMSADDRESSMARKER_TOUCH'); ?>'
data-scrollmac='<?php echo JText::_('PLG_AGOSMSADDRESSMARKER_SCROLLMAC'); ?>'
data-uriroot='<?php echo JUri::root(); ?>' class="leafletmapMod" id="map<?php echo $module->id; ?>">
</div>

<?php if ($params->get('addprivacybox', '0')) : ?>
<p class="p<?php echo $unique ?>"></p>
<button class="btn btn-success b<?php echo $unique ?>" type="button">
<?php echo JText::_('MOD_AGOSM_PRIVACYBUTTON_SHOW_MAP'); ?>
<?php echo JText::_('MOD_AGOSM_PRIVACYBUTTON_SHOW_MAP'); ?>
</button>
<?php endif; ?>

Expand All @@ -77,23 +82,23 @@

<style>
.leaflet-layerstree-children {
display: flex;
flex-direction: row;
flex-wrap: wrap;
font-size: 0.85rem;
justify-content: space-evenly;
display: flex;
flex-direction: row;
flex-wrap: wrap;
font-size: 0.85rem;
justify-content: space-evenly;
}
.leaflet-control-layers-expanded {
width:100%;
width:100%;
}
.leaflet-control-routingtoaddress{
}
</style>


<div class="px-1 py-1 my-5 text-center bg-light bg-gradient">
<div class="text-center" id="agosms-mt-form-layer<?php echo $module->id; ?>"></div>
<div class="text-center" id="agosms-mt-form-radius<?php echo $module->id; ?>"></div>
<div class="text-center" id="agosms-mt-form-layer<?php echo $module->id; ?>"></div>
<div class="text-center" id="agosms-mt-form-radius<?php echo $module->id; ?>"></div>
</div>

<?php
Expand Down
2 changes: 1 addition & 1 deletion ...g_agosms/src/plugins/system/agosmssearchagosms/template/com_agosms/gsearchagosms_blog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
'alt' => "",
'itemprop' => 'image',
]
); ?></td>
); ?></td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 61376e0

Please sign in to comment.