- fix bug
- can now set "style" on geojson elements
This commit is contained in:
1 parent
77b5f34eed
commit
da245fdf27
3 files changed
+23
-9
No files matched your search
@@ -7,6 +7,9 @@ mapCenter =
|
|||||||
lng: -72.6169
|
lng: -72.6169
|
||||||
zoom: 7
|
zoom: 7
|
||||||
|
|
||||||
|
getLocalStorageCenter = () ->
|
||||||
|
JSON.parse(localStorage.getItem("mapCenter"))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
getSingleDataUrl = (routeParams) ->
|
getSingleDataUrl = (routeParams) ->
|
||||||
@@ -36,9 +39,8 @@ transformListOfGeoJsonToGeometryCollection = (resData, routeParams) ->
|
|||||||
feature =
|
feature =
|
||||||
type: "Feature"
|
type: "Feature"
|
||||||
geometry: geojson,
|
geometry: geojson,
|
||||||
properties:
|
properties: geojson.properties
|
||||||
"_vulture_url_link": getDocumentUrl(routeParams, doc._id)
|
ret.features.push(feature)
|
||||||
ret.features.push(geojson)
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
@@ -46,7 +48,10 @@ root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$locat
|
|||||||
$scope.geojson = {}
|
$scope.geojson = {}
|
||||||
$scope.geojsonData = {}
|
$scope.geojsonData = {}
|
||||||
$scope.idx = Number($routeParams.idx)
|
$scope.idx = Number($routeParams.idx)
|
||||||
$scope.center = mapCenter
|
$scope.center = getLocalStorageCenter()
|
||||||
|
|
||||||
|
$scope.$watch 'center', () ->
|
||||||
|
localStorage.setItem("mapCenter", JSON.stringify($scope.center))
|
||||||
|
|
||||||
$scope.getAggredatedUrl = () ->
|
$scope.getAggredatedUrl = () ->
|
||||||
url = "#/#{ $routeParams.server }/#{ $routeParams.database }/#{ $routeParams.collection }/idx/all"
|
url = "#/#{ $routeParams.server }/#{ $routeParams.database }/#{ $routeParams.collection }/idx/all"
|
||||||
@@ -72,6 +77,12 @@ root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$locat
|
|||||||
|
|
||||||
$scope.$on "leafletDirectiveMap.geojsonClick", (ev, featureSelected, leafletEvent) ->
|
$scope.$on "leafletDirectiveMap.geojsonClick", (ev, featureSelected, leafletEvent) ->
|
||||||
$location.url(featureSelected.properties._vulture_url_link);
|
$location.url(featureSelected.properties._vulture_url_link);
|
||||||
|
|
||||||
|
$scope.setStyleOnFeature = (feature, element) ->
|
||||||
|
if feature.properties and feature.properties.style
|
||||||
|
element.setStyle(feature.properties.style)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.initSingleDocument = ()->
|
$scope.initSingleDocument = ()->
|
||||||
url = getSingleDataUrl($routeParams)
|
url = getSingleDataUrl($routeParams)
|
||||||
@@ -83,16 +94,17 @@ root.controllers.controller('geojsonmapCtrl', ['$scope', '$routeParams', '$locat
|
|||||||
$scope.meta = res.data.meta
|
$scope.meta = res.data.meta
|
||||||
$scope.geojsonData =
|
$scope.geojsonData =
|
||||||
data: geojson
|
data: geojson
|
||||||
style: undefined
|
style: geojson.properties.style or undefined
|
||||||
resetStyleOnMouseout: true
|
resetStyleOnMouseout: true
|
||||||
|
|
||||||
$scope.initAllDocuments = () ->
|
$scope.initAllDocuments = () ->
|
||||||
url = getAllDataUrl($routeParams)
|
url = getAllDataUrl($routeParams)
|
||||||
util.get(url).then (res) ->
|
util.get(url).then (res) ->
|
||||||
$scope.meta = res.data.meta
|
$scope.meta = res.data.meta
|
||||||
|
geojson = transformListOfGeoJsonToGeometryCollection(res.data, $routeParams)
|
||||||
$scope.geojsonData =
|
$scope.geojsonData =
|
||||||
data: transformListOfGeoJsonToGeometryCollection(res.data, $routeParams)
|
data: geojson
|
||||||
style: undefined
|
onEachFeature: $scope.setStyleOnFeature
|
||||||
resetStyleOnMouseout: true
|
resetStyleOnMouseout: true
|
||||||
|
|
||||||
if $routeParams.idx
|
if $routeParams.idx
|
||||||
|
|||||||
@@ -22,4 +22,4 @@
|
|||||||
<div class="large-12 columns" style="text-align: center;" >
|
<div class="large-12 columns" style="text-align: center;" >
|
||||||
<a ng-href="{{ getAggredatedUrl() }}">Aggregated representation</a>
|
<a ng-href="{{ getAggredatedUrl() }}">Aggregated representation</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
+3
-1
@@ -32,5 +32,7 @@ func (this ApiHandler) ServeHTTP(w http.ResponseWriter, request *http.Request) {
|
|||||||
w.WriteHeader(200)
|
w.WriteHeader(200)
|
||||||
}
|
}
|
||||||
enc := json.NewEncoder(w)
|
enc := json.NewEncoder(w)
|
||||||
enc.Encode(ret)
|
if err := enc.Encode(ret); err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user