Use strings for GeometryType in examples

This commit is contained in:
Antoine Abt
2014-02-07 15:37:06 +01:00
parent f9b6eabfef
commit 919fbe335f

View File

@@ -1,8 +1,6 @@
goog.require('ol.FeatureOverlay'); goog.require('ol.FeatureOverlay');
goog.require('ol.Map'); goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D'); goog.require('ol.View2D');
goog.require('ol.geom.GeometryType');
goog.require('ol.interaction'); goog.require('ol.interaction');
goog.require('ol.interaction.Modify'); goog.require('ol.interaction.Modify');
goog.require('ol.interaction.Select'); goog.require('ol.interaction.Select');
@@ -166,9 +164,8 @@ var vectorLayer = new ol.layer.Vector({
}); });
var overlayStyle = (function() { var overlayStyle = (function() {
/** @type {Object.<ol.geom.GeometryType, Array.<ol.style.Style>>} */
var styles = {}; var styles = {};
styles[ol.geom.GeometryType.POLYGON] = [ styles['polygon'] = [
new ol.style.Style({ new ol.style.Style({
fill: new ol.style.Fill({ fill: new ol.style.Fill({
color: [255, 255, 255, 0.5] color: [255, 255, 255, 0.5]
@@ -187,10 +184,9 @@ var overlayStyle = (function() {
}) })
}) })
]; ];
styles[ol.geom.GeometryType.MULTI_POLYGON] = styles['multipolygon'] = styles['polygon'];
styles[ol.geom.GeometryType.POLYGON];
styles[ol.geom.GeometryType.LINE_STRING] = [ styles['linestring'] = [
new ol.style.Style({ new ol.style.Style({
stroke: new ol.style.Stroke({ stroke: new ol.style.Stroke({
color: [255, 255, 255, 1], color: [255, 255, 255, 1],
@@ -204,10 +200,9 @@ var overlayStyle = (function() {
}) })
}) })
]; ];
styles[ol.geom.GeometryType.MULTI_LINE_STRING] = styles['multilinestring'] = styles['linestring'];
styles[ol.geom.GeometryType.LINE_STRING];
styles[ol.geom.GeometryType.POINT] = [ styles['point'] = [
new ol.style.Style({ new ol.style.Style({
image: new ol.style.Circle({ image: new ol.style.Circle({
radius: 7, radius: 7,
@@ -222,12 +217,9 @@ var overlayStyle = (function() {
zIndex: 100000 zIndex: 100000
}) })
]; ];
styles[ol.geom.GeometryType.MULTI_POINT] = styles['multipoint'] = styles['point'];
styles[ol.geom.GeometryType.POINT];
styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] = styles['geometrycollection'] = styles['polygon'].concat(styles['point']);
styles[ol.geom.GeometryType.POLYGON].concat(
styles[ol.geom.GeometryType.POINT]);
return function(feature, resolution) { return function(feature, resolution) {
return styles[feature.getGeometry().getType()]; return styles[feature.getGeometry().getType()];
@@ -244,7 +236,7 @@ var select = new ol.interaction.Select({ featureOverlay: overlay });
var map = new ol.Map({ var map = new ol.Map({
interactions: ol.interaction.defaults().extend([select, modify]), interactions: ol.interaction.defaults().extend([select, modify]),
layers: [raster, vectorLayer], layers: [raster, vectorLayer],
renderer: ol.RendererHint.CANVAS, renderer: 'canvas',
target: 'map', target: 'map',
view: new ol.View2D({ view: new ol.View2D({
center: [0, 0], center: [0, 0],