ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into vector-api

Browse Source
This commit is contained in:
Tom Payne
2013-11-28 21:00:18 +01:00
parent a06ba8d4aa 1ac93d09c9
commit d2fd695635
17 changed files with 280 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
old/examples/draw-features.js
View File

@@ -18,7 +18,7 @@ var raster = new ol.layer.Tile({
});
var vector = new ol.layer.Vector({
source: new ol.source.Vector({parser: null}),
source: new ol.source.Vector(),
style: new ol.style.Style({
rules: [
new ol.style.Rule({

161
old/examples/style-rules.js
View File

@@ -1,11 +1,12 @@
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.View2D');
goog.require('ol.control');
goog.require('ol.expr');
goog.require('ol.geom.LineString');
goog.require('ol.geom.Point');
goog.require('ol.layer.Vector');
goog.require('ol.parser.GeoJSON');
goog.require('ol.proj');
goog.require('ol.source.Vector');
goog.require('ol.style.Fill');
goog.require('ol.style.Rule');
@@ -62,108 +63,60 @@ var style = new ol.style.Style({rules: [
var vector = new ol.layer.Vector({
style: style,
source: new ol.source.Vector({
data: {
'type': 'FeatureCollection',
'features': [{
'type': 'Feature',
'properties': {
'color': '#BADA55',
'where': 'inner'
},
'geometry': {
'type': 'LineString',
'coordinates': [[-10000000, -10000000], [10000000, 10000000]]
}
}, {
'type': 'Feature',
'properties': {
'color': '#BADA55',
'where': 'inner'
},
'geometry': {
'type': 'LineString',
'coordinates': [[-10000000, 10000000], [10000000, -10000000]]
}
}, {
'type': 'Feature',
'properties': {
'color': '#013',
'where': 'outer'
},
'geometry': {
'type': 'LineString',
'coordinates': [[-10000000, -10000000], [-10000000, 10000000]]
}
}, {
'type': 'Feature',
'properties': {
'color': '#013',
'where': 'outer'
},
'geometry': {
'type': 'LineString',
'coordinates': [[-10000000, 10000000], [10000000, 10000000]]
}
}, {
'type': 'Feature',
'properties': {
'color': '#013',
'where': 'outer'
},
'geometry': {
'type': 'LineString',
'coordinates': [[10000000, 10000000], [10000000, -10000000]]
}
}, {
'type': 'Feature',
'properties': {
'color': '#013',
'where': 'outer'
},
'geometry': {
'type': 'LineString',
'coordinates': [[10000000, -10000000], [-10000000, -10000000]]
}
}, {
'type': 'Feature',
'properties': {
'label': 'South'
},
'geometry': {
'type': 'Point',
'coordinates': [0, -6000000]
}
}, {
'type': 'Feature',
'properties': {
'label': 'West'
},
'geometry': {
'type': 'Point',
'coordinates': [-6000000, 0]
}
}, {
'type': 'Feature',
'properties': {
'label': 'North'
},
'geometry': {
'type': 'Point',
'coordinates': [0, 6000000]
}
}, {
'type': 'Feature',
'properties': {
'label': 'East'
},
'geometry': {
'type': 'Point',
'coordinates': [6000000, 0]
}
}]
},
parser: new ol.parser.GeoJSON(),
projection: ol.proj.get('EPSG:3857')
features: [
new ol.Feature({
color: '#BADA55',
where: 'inner',
geometry: new ol.geom.LineString(
[[-10000000, -10000000], [10000000, 10000000]])
}),
new ol.Feature({
color: '#BADA55',
where: 'inner',
geometry: new ol.geom.LineString(
[[-10000000, 10000000], [10000000, -10000000]])
}),
new ol.Feature({
color: '#013',
where: 'outer',
geometry: new ol.geom.LineString(
[[-10000000, -10000000], [-10000000, 10000000]])
}),
new ol.Feature({
color: '#013',
where: 'outer',
geometry: new ol.geom.LineString(
[[-10000000, 10000000], [10000000, 10000000]])
}),
new ol.Feature({
color: '#013',
where: 'outer',
geometry: new ol.geom.LineString(
[[10000000, 10000000], [10000000, -10000000]])
}),
new ol.Feature({
color: '#013',
where: 'outer',
geometry: new ol.geom.LineString(
[[10000000, -10000000], [-10000000, -10000000]])
}),
new ol.Feature({
label: 'South',
geometry: new ol.geom.Point([0, -6000000])
}),
new ol.Feature({
label: 'West',
geometry: new ol.geom.Point([-6000000, 0])
}),
new ol.Feature({
label: 'North',
geometry: new ol.geom.Point([0, 6000000])
}),
new ol.Feature({
label: 'East',
geometry: new ol.geom.Point([6000000, 0])
})
]
})
});