Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Improve handling of omnivore data loading.

Browse Source
This commit is contained in:
David Molineus
2015-01-18 13:14:32 +01:00
parent 1660f61099
commit 8da943dd9d
2 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/maps/contao-leaflet.js
View File

@@ -113,7 +113,7 @@ L.contao = new (L.Class.extend({
* @param customLayer optional custom layer. * @param customLayer optional custom layer.
* @param map Pass a map object so that the data loading events are passed to the map. * @param map Pass a map object so that the data loading events are passed to the map.
*/ */
loadLayer: function(hash, type, options, customLayer, map) { load: function(hash, type, options, customLayer, map) {
var url = this.createRequestUrl(hash); var url = this.createRequestUrl(hash);
var layer = omnivore[type](url, options, customLayer); var layer = omnivore[type](url, options, customLayer);

40
src/Netzmacht/Contao/Leaflet/Subscriber/EncoderSubscriber.php
View File

@@ -89,7 +89,7 @@ class EncoderSubscriber implements EventSubscriberInterface
{ {
$value = $event->getValue(); $value = $event->getValue();
$encoder = $event->getEncoder(); $encoder = $event->getEncoder();
$ref = $encoder->encodeReference($value); $template = 'L.contao.load(%s, %s, %s, %s, map);';
if ($value instanceof OmnivoreLayer) { if ($value instanceof OmnivoreLayer) {
$url = $value->getUrl(); $url = $value->getUrl();
@@ -97,18 +97,24 @@ class EncoderSubscriber implements EventSubscriberInterface
if ($url instanceof RequestUrl) { if ($url instanceof RequestUrl) {
$url = $url->getHash(); $url = $url->getHash();
} elseif (strpos($url, '/') !== false) { } elseif (strpos($url, '/') !== false) {
// Slash found, not contao leaflet hash, do not replace encoding. // Slash found, not a Contao leaflet hash, do not replace encoding.
return; return;
} }
if ($value->getCustomLayer()) {
$ref = $encoder->encodeReference($value->getCustomLayer());
} else {
$template = $encoder->encodeReference($value) . ' = ' . $template;
$ref = 'null';
}
$event->addLine( $event->addLine(
sprintf( sprintf(
'%s = L.contao.loadLayer(%s, %s, %s, %s, map);', $template,
$ref,
$encoder->encodeValue($url), $encoder->encodeValue($url),
$encoder->encodeValue(strtolower(str_replace('Omnivore.', '', $value->getType()))), $encoder->encodeValue(strtolower(str_replace('Omnivore.', '', $value->getType()))),
$encoder->encodeArray($value->getOptions(), JSON_FORCE_OBJECT), $encoder->encodeArray($value->getOptions(), JSON_FORCE_OBJECT),
$this->encodeCustomLayer($value, $encoder) $ref
) )
); );
@@ -121,28 +127,4 @@ class EncoderSubscriber implements EventSubscriberInterface
} }
} }
} }
/**
* Encode a custom layer for the omnivore plugin.
*
* @param OmnivoreLayer $layer The layer.
* @param Encoder $encoder The javascript encoder.
*
* @return string
*/
protected function encodeCustomLayer(OmnivoreLayer $layer, Encoder $encoder)
{
$customLayer = $layer->getCustomLayer();
if ($customLayer instanceof GeoJson && !$customLayer->getMethodCalls()) {
return sprintf(
'L.geoJson(null, %s)',
$encoder->encodeValue($customLayer->getOptions())
);
} elseif ($customLayer) {
return $encoder->encodeReference($customLayer);
}
return 'null';
}
} }