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

Merge branch 'master' of github.com:openlayers/openlayers into transform

Browse Source 
Conflicts:
	theme/default/style.css
This commit is contained in:
ahocevar
2013-01-09 14:31:52 +01:00
parent 1b2003a2b4 443c715f51
commit 9b7e35d1dd
296 changed files with 2303 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
examples/encoded-polyline.html Normal file
View File

File diff suppressed because one or more lines are too long

1
examples/mobile-base.js
View File

@@ -42,6 +42,7 @@ var init = function (onSelectFeatureFunction) {
theme: null,
projection: sm,
numZoomLevels: 18,
tileManager: new OpenLayers.TileManager(),
controls: [
new OpenLayers.Control.Attribution(),
new OpenLayers.Control.TouchNavigation({

1
examples/mobile-wmts-vienna.js
View File

@@ -99,6 +99,7 @@ var map;
maxExtent: [-20037508.34, -20037508.34, 20037508.34, 20037508.34],
maxResolution: 156543.0339,
numZoomLevels: 20,
tileManager: new OpenLayers.TileManager(),
controls: [
new OpenLayers.Control.Navigation({
mouseWheelOptions: {

11
examples/vector-formats.html
View File

@@ -87,8 +87,9 @@
gml3: new OpenLayers.Format.GML.v3(gmlOptionsIn),
kml: new OpenLayers.Format.KML(kmlOptionsIn),
atom: new OpenLayers.Format.Atom(in_options),
gpx: new OpenLayers.Format.GPX(in_options)
},
gpx: new OpenLayers.Format.GPX(in_options),
encoded_polyline: new OpenLayers.Format.EncodedPolyline(in_options)
},
'out': {
wkt: new OpenLayers.Format.WKT(out_options),
geojson: new OpenLayers.Format.GeoJSON(out_options),
@@ -97,8 +98,9 @@
gml3: new OpenLayers.Format.GML.v3(gmlOptionsOut),
kml: new OpenLayers.Format.KML(out_options),
atom: new OpenLayers.Format.Atom(out_options),
gpx: new OpenLayers.Format.GPX(out_options)
}
gpx: new OpenLayers.Format.GPX(out_options),
encoded_polyline: new OpenLayers.Format.EncodedPolyline(out_options)
}
};
}
function init(){
@@ -202,6 +204,7 @@
<option value="gml3">GML (v3)</option>
<option value="wkt">Well-Known Text (WKT)</option>
<option value="gpx">GPX</option>
<option value="encoded_polyline">Encoded Polyline</option>
</select>
&nbsp;
<label for="prettyPrint">Pretty print</label>