});
function startBrowse(sidebarHtml) {
- var browseBoxControl;
- var browseMode = "auto";
var browseBounds;
- var browseFeatureList;
- var browseActiveFeature;
- var browseDataLayer;
- var browseSelectControl;
+ var layersById;
+ var selectedLayer;
var browseObjectList;
var areasHidden = false;
- OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
- OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
+ var dataLayer = new L.OSM.DataLayer(null, {
+ styles: {
+ way: {
+ weight: 3,
+ color: "#000000",
+ opacity: 0.4
+ },
+ area: {
+ weight: 3,
+ color: "#ff0000"
+ },
+ node: {
+ color: "#00ff00"
+ }
+ }
+ });
- map.dataLayer.active = true;
+ dataLayer.addTo(map);
- $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
- $("#sidebar_content").html(sidebarHtml);
+ dataLayer.isWayArea = function () {
+ return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
+ };
- openSidebar();
+ var locationFilter = new L.LocationFilter({
+ enableButton: false,
+ adjustButton: false
+ }).addTo(map);
- var vectors = new OpenLayers.Layer.Vector();
+ locationFilter.on("change", getData);
- browseBoxControl = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, {
- handlerOptions: {
- sides: 4,
- snapAngle: 90,
- irregular: true,
- persist: true
- }
- });
- browseBoxControl.handler.callbacks.done = endDrag;
- map.addControl(browseBoxControl);
+ $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
+ $("#sidebar_content").html(sidebarHtml);
- map.events.register("moveend", map, updateData);
- map.events.triggerEvent("moveend");
+ openSidebar();
- $("#browse_select_view").click(useMap);
+ map.on("moveend", updateData);
+ updateData();
- $("#browse_select_box").click(startDrag);
+ $("#browse_filter_toggle").toggle(enableFilter, disableFilter);
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
- $("#browse_hide_areas_box").show();
- $("#browse_hide_areas_box").click(hideAreas);
+ $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
function updateData() {
- if (browseMode == "auto") {
+ if (!locationFilter.isEnabled()) {
if (map.getZoom() >= 15) {
- useMap(false);
+ var bounds = map.getBounds();
+ if (!browseBounds || !browseBounds.contains(bounds)) {
+ browseBounds = bounds;
+ getData();
+ }
} else {
- setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
+ setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
}
}
}
$("#sidebar").one("closed", function () {
- if (map.dataLayer.active) {
- map.dataLayer.active = false;
-
- if (browseSelectControl) {
- browseSelectControl.destroy();
- browseSelectControl = null;
- }
-
- if (browseBoxControl) {
- browseBoxControl.destroy();
- browseBoxControl = null;
- }
-
- if (browseActiveFeature) {
- browseActiveFeature.destroy();
- browseActiveFeature = null;
- }
-
- if (browseDataLayer) {
- browseDataLayer.destroy();
- browseDataLayer = null;
- }
-
- map.dataLayer.setVisibility(false);
- map.events.unregister("moveend", map, updateData);
- }
+ map.removeLayer(dataLayer);
+ map.removeLayer(locationFilter);
+ map.off("moveend", updateData);
+ locationFilter.off("change", getData);
});
- function startDrag() {
- $("#browse_select_box").html(I18n.t('browse.start_rjs.drag_a_box'));
-
- browseBoxControl.activate();
-
- return false;
+ function enableFilter() {
+ $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
+ locationFilter.enable();
+ getData();
}
- function useMap(reload) {
- var bounds = map.getExtent();
- var projected = unproj(bounds);
-
- if (!browseBounds || !browseBounds.containsBounds(projected)) {
- var center = bounds.getCenterLonLat();
- var tileWidth = bounds.getWidth() * 1.2;
- var tileHeight = bounds.getHeight() * 1.2;
- var tileBounds = new OpenLayers.Bounds(center.lon - (tileWidth / 2),
- center.lat - (tileHeight / 2),
- center.lon + (tileWidth / 2),
- center.lat + (tileHeight / 2));
-
- browseBounds = tileBounds;
- getData(tileBounds, reload);
-
- browseMode = "auto";
-
- $("#browse_select_view").hide();
- }
-
- return false;
+ function disableFilter() {
+ $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
+ locationFilter.disable();
+ getData();
}
function hideAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
- $("#browse_hide_areas_box").show();
- $("#browse_hide_areas_box").click(showAreas);
-
areasHidden = true;
-
- useMap(true);
+ getData();
}
function showAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
- $("#browse_hide_areas_box").show();
- $("#browse_hide_areas_box").click(hideAreas);
-
areasHidden = false;
-
- useMap(true);
- }
-
- function endDrag(bbox) {
- var bounds = bbox.getBounds();
- var projected = unproj(bounds);
-
- browseBoxControl.deactivate();
- browseBounds = projected;
- getData(bounds);
-
- browseMode = "manual";
-
- $("#browse_select_box").html(I18n.t('browse.start_rjs.manually_select'));
- $("#browse_select_view").show();
+ getData();
}
function displayFeatureWarning(count, limit, callback) {
$("#browse_content").append(div);
}
- function customDataLoader(resp, options) {
- if (map.dataLayer.active) {
- var request = resp.priv;
- var doc = request.responseXML;
-
- if (!doc || !doc.documentElement) {
- doc = request.responseText;
- }
-
- resp.features = this.format.read(doc);
-
- if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
- options.callback.call(options.scope, resp);
- } else {
- displayFeatureWarning(resp.features.length, this.maxFeatures, function () {
- options.callback.call(options.scope, resp);
- });
- }
- }
- }
-
- function getData(bounds, reload) {
- var projected = unproj(bounds);
- var size = projected.getWidth() * projected.getHeight();
+ function getData() {
+ var bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
+ var size = bounds.getSize();
if (size > OSM.MAX_REQUEST_AREA) {
setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
- } else {
- loadData("/api/" + OSM.API_VERSION + "/map?bbox=" + projected.toBBOX(), reload);
+ return;
}
- }
- function loadData(url, reload) {
setStatus(I18n.t('browse.start_rjs.loading'));
- $("#browse_content").empty();
+ var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBOX();
- var formatOptions = {
- checkTags: true,
- interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
- };
+ /*
+ * Modern browsers are quite happy showing far more than 100 features in
+ * the data browser, so increase the limit to 2000 by default, but keep
+ * it restricted to 500 for IE8 and 100 for older IEs.
+ */
+ var maxFeatures = 2000;
- if (areasHidden) formatOptions.areaTags = [];
+ /*@cc_on
+ if (navigator.appVersion < 8) {
+ maxFeatures = 100;
+ } else if (navigator.appVersion < 9) {
+ maxFeatures = 500;
+ }
+ @*/
- if (!browseDataLayer || reload) {
- var style = new OpenLayers.Style();
+ $.ajax({
+ url: url,
+ success: function (xml) {
+ clearStatus();
- style.addRules([new OpenLayers.Rule({
- symbolizer: {
- Polygon: { fillColor: '#ff0000', strokeColor: '#ff0000' },
- Line: { fillColor: '#ffff00', strokeColor: '#000000', strokeOpacity: '0.4' },
- Point: { fillColor: '#00ff00', strokeColor: '#00ff00' }
- }
- })]);
-
- if (browseDataLayer) browseDataLayer.destroyFeatures();
-
- /*
- * Modern browsers are quite happy showing far more than 100 features in
- * the data browser, so increase the limit to 2000 by default, but keep
- * it restricted to 500 for IE8 and 100 for older IEs.
- */
- var maxFeatures = 2000;
-
- /*@cc_on
- if (navigator.appVersion < 8) {
- maxFeatures = 100;
- } else if (navigator.appVersion < 9) {
- maxFeatures = 500;
- }
- @*/
-
- browseDataLayer = new OpenLayers.Layer.Vector("Data", {
- strategies: [
- new OpenLayers.Strategy.Fixed()
- ],
- protocol: new OpenLayers.Protocol.HTTP({
- url: url,
- format: new OpenLayers.Format.OSM(formatOptions),
- maxFeatures: maxFeatures,
- handleRead: customDataLoader
- }),
- projection: new OpenLayers.Projection("EPSG:4326"),
- displayInLayerSwitcher: false,
- styleMap: new OpenLayers.StyleMap({
- 'default': style,
- 'select': { strokeColor: '#0000ff', strokeWidth: 8 }
- })
- });
- browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
- map.addLayer(browseDataLayer);
-
- browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });
- browseSelectControl.handlers.feature.stopDown = false;
- browseSelectControl.handlers.feature.stopUp = false;
- map.addControl(browseSelectControl);
- browseSelectControl.activate();
- } else {
- browseDataLayer.destroyFeatures();
- browseDataLayer.refresh({ url: url });
- }
+ $("#browse_content").empty();
+ dataLayer.clearLayers();
+ selectedLayer = null;
- browseActiveFeature = null;
- }
+ var features = dataLayer.buildFeatures(xml);
- function dataLoaded() {
- if (this.map.dataLayer.active) {
- clearStatus();
-
- var features = [];
- for (var i = 0; i < this.features.length; i++) {
- var feature = this.features[i];
- features.push({
- typeName: featureTypeName(feature),
- url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
- name: featureName(feature),
- id: feature.id
- });
- }
+ function addFeatures() {
+ dataLayer.addData(features);
- browseObjectList = $(JST["templates/browse/feature_list"]({
- features: features,
- url: this.protocol.url
- }))[0];
+ layersById = {};
- loadObjectList();
- }
+ dataLayer.eachLayer(function (layer) {
+ var feature = layer.feature;
+ layersById[feature.id] = layer;
+ $.extend(feature, {
+ typeName: featureTypeName(feature),
+ url: "/browse/" + feature.type + "/" + feature.id,
+ name: featureName(feature)
+ });
+ });
+
+ browseObjectList = $(JST["templates/browse/feature_list"]({
+ features: features,
+ url: url
+ }))[0];
+
+ loadObjectList();
+ }
+
+ if (features.length < maxFeatures) {
+ addFeatures();
+ } else {
+ displayFeatureWarning(features.length, maxFeatures, addFeatures);
+ }
+ }
+ });
}
function viewFeatureLink() {
- var feature = browseDataLayer.getFeatureById($(this).data("feature-id"));
- var layer = feature.layer;
-
- for (var i = 0; i < layer.selectedFeatures.length; i++) {
- var f = layer.selectedFeatures[i];
- layer.drawFeature(f, layer.styleMap.createSymbolizer(f, "default"));
- }
+ var layer = layersById[$(this).data("feature-id")];
- onFeatureSelect(feature);
+ onSelect(layer);
- if (browseMode != "auto") {
- map.setCenter(feature.geometry.getBounds().getCenterLonLat());
+ if (locationFilter.isEnabled()) {
+ map.panTo(layer.getBounds().getCenter());
}
return false;
return false;
}
- function onFeatureSelect(feature) {
+ function onSelect(layer) {
// Unselect previously selected feature
- if (browseActiveFeature) {
- browseActiveFeature.layer.drawFeature(
- browseActiveFeature,
- browseActiveFeature.layer.styleMap.createSymbolizer(browseActiveFeature, "default")
- );
+ if (selectedLayer) {
+ selectedLayer.setStyle(selectedLayer.originalStyle);
}
// Redraw in selected style
- feature.layer.drawFeature(
- feature, feature.layer.styleMap.createSymbolizer(feature, "select")
- );
+ layer.originalStyle = layer.options;
+ layer.setStyle({color: '#0000ff', weight: 8});
// If the current object is the list, don't innerHTML="", since that could clear it.
if ($("#browse_content").firstChild == browseObjectList) {
$("#browse_content").empty();
}
+ var feature = layer.feature;
+
$("#browse_content").html(JST["templates/browse/feature"]({
name: featureNameSelect(feature),
- url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
- attributes: feature.attributes
+ url: "/browse/" + feature.type + "/" + feature.id,
+ attributes: feature.tags
}));
$("#browse_content").find("a.browse_show_list").click(loadObjectList);
$("#browse_content").find("a.browse_show_history").click(loadHistory);
// Stash the currently drawn feature
- browseActiveFeature = feature;
+ selectedLayer = layer;
}
+ dataLayer.on("click", function (e) {
+ onSelect(e.layer);
+ });
+
function loadHistory() {
$(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
- var feature = browseActiveFeature;
+ var feature = selectedLayer.feature;
$.ajax({
- url: "/api/" + OSM.API_VERSION + "/" + featureType(feature) + "/" + feature.osm_id + "/history",
+ url: "/api/" + OSM.API_VERSION + "/" + feature.type + "/" + feature.id + "/history",
success: function (xml) {
- if (browseActiveFeature != feature || $("#browse_content").firstChild == browseObjectList) {
+ if (selectedLayer.feature != feature || $("#browse_content").firstChild == browseObjectList) {
return;
}
$(this).remove();
var history = [];
- var nodes = xml.getElementsByTagName(featureType(feature));
+ var nodes = xml.getElementsByTagName(feature.type);
for (var i = nodes.length - 1; i >= 0; i--) {
history.push({
user: nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user'),
$("#browse_content").append(JST["templates/browse/feature_history"]({
name: featureNameHistory(feature),
- url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
+ url: "/browse/" + feature.type + "/" + feature.id,
history: history
}));
}.bind(this)
return false;
}
- function featureType(feature) {
- if (feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
- return "node";
- } else {
- return "way";
- }
- }
-
function featureTypeName(feature) {
- if (featureType(feature) == "node") {
- return I18n.t('browse.start_rjs.object_list.type.node');
- } else if (featureType(feature) == "way") {
- return I18n.t('browse.start_rjs.object_list.type.way');
- }
+ return I18n.t('browse.start_rjs.object_list.type.' + feature.type);
}
function featureName(feature) {
- var lang = $('html').attr('lang');
- if (feature.attributes['name:' + lang]) {
- return feature.attributes['name:' + lang];
- } else if (feature.attributes.name) {
- return feature.attributes.name;
- } else {
- return feature.osm_id;
- }
+ return feature.tags['name:' + $('html').attr('lang')] ||
+ feature.tags.name ||
+ feature.id;
}
function featureNameSelect(feature) {
- var lang = $('html').attr('lang');
- if (feature.attributes['name:' + lang]) {
- return feature.attributes['name:' + lang];
- } else if (feature.attributes.name) {
- return feature.attributes.name;
- } else if (featureType(feature) == "node") {
- return I18n.t("browse.start_rjs.object_list.selected.type.node", { id: feature.osm_id });
- } else if (featureType(feature) == "way") {
- return I18n.t("browse.start_rjs.object_list.selected.type.way", { id: feature.osm_id });
- }
+ return feature.tags['name:' + $('html').attr('lang')] ||
+ feature.tags.name ||
+ I18n.t("browse.start_rjs.object_list.selected.type." + feature.type, { id: feature.id });
}
function featureNameHistory(feature) {
- var lang = $('html').attr('lang');
- if (feature.attributes['name:' + lang]) {
- return feature.attributes['name:' + lang];
- } else if (feature.attributes.name) {
- return feature.attributes.name;
- } else if (featureType(feature) == "node") {
- return I18n.t("browse.start_rjs.object_list.history.type.node", { id: feature.osm_id });
- } else if (featureType(feature) == "way") {
- return I18n.t("browse.start_rjs.object_list.history.type.way", { id: feature.osm_id });
- }
+ return feature.tags['name:' + $('html').attr('lang')] ||
+ feature.tags.name ||
+ I18n.t("browse.start_rjs.object_list.history.type." + feature.type, { id: feature.id });
}
function setStatus(status) {
$("#browse_status").hide();
}
}
-});
\ No newline at end of file
+});
projects / rails.git / blobdiff