Compare commits

..

8 Commits

Author SHA1 Message Date
Tim Schaub 35b19d1974 3.16.0-alpha.2 2016-05-18 21:24:15 -06:00
Tim Schaub 94ae282c57 Less weird name 2016-05-18 21:22:14 -06:00
Tim Schaub 9050ee550f Demonstrate how source.setUrl() works 2016-05-18 21:14:25 -06:00
Tim Schaub 2c1353f6e9 Allow XYZ source construction without options 2016-05-18 21:13:55 -06:00
Tim Schaub 783721951a Less special handling for WMTS tiles 2016-05-18 18:52:42 -06:00
Tim Schaub c5dcde4455 Less special handling for WMS tiles 2016-05-18 18:47:38 -06:00
Tim Schaub 47cc4aac62 Rename source.getKeyParams() to source.getKey() 2016-05-18 18:34:50 -06:00
Tim Schaub f86e7e5a71 Add a settable key for all tile sources
The source's key is used as the key for all tiles in the source.  For URL tile sources, the URL is the key.
2016-05-18 18:27:19 -06:00
33 changed files with 373 additions and 609 deletions
-9
View File
@@ -1,17 +1,8 @@
## Upgrade notes ## Upgrade notes
### v3.16.0
#### Rendering change for tile sources
Previously, if you called `source.setUrl()` on a tile source, all currently rendered tiles would be cleared before new tiles were loaded and rendered. This clearing of the map is undesirable if you are trying to smoothly update the tiles used by a source. This behavior has now changed, and calling `source.setUrl()` (or `source.setUrls()`) will *not* clear currently rendered tiles before loading and rendering new tiles. Instead, previously rendered tiles remain rendered until new tiles have loaded and can replace them. If you want to achieve the old behavior (render a blank map before loading new tiles), you can call `source.refresh()` or you can replace the old source with a new one (using `layer.setSource()`).
#### Move of typedefs out of code and into separate file #### Move of typedefs out of code and into separate file
This change should not affect the great majority of application developers, but it's possible there are edge cases when compiling application code together with the library which cause compiler errors or warnings. In this case, please raise a GitHub issue. `goog.require`s for typedefs should not be necessary. This change should not affect the great majority of application developers, but it's possible there are edge cases when compiling application code together with the library which cause compiler errors or warnings. In this case, please raise a GitHub issue. `goog.require`s for typedefs should not be necessary.
Users compiling their code with the library should note that the following API `@typedef`s have been renamed; your code may need changing if you use these:
* `ol.format.WFS.FeatureCollectionMetadata` to `ol.WFSFeatureCollectionMetadata`
* `ol.format.WFS.TransactionResponse` to `ol.WFSTransactionResponse`
#### Removal of `opaque` option for `ol.source.VectorTile` #### Removal of `opaque` option for `ol.source.VectorTile`
-148
View File
@@ -1,148 +0,0 @@
# v3.16.0
## Summary
The v3.16.0 release includes features and fixes from 95 pull requests since the v3.15.1 release. New features and improvements include:
* Add `ol.source.ImageArcGISRest` for ArcGIS REST image layer support (#3880)
* New `finishCondition` option for `ol.interaction.Draw` to control which action should finish a geometry when drawing (#5261)
* New filter API for `ol.format.WFS#writeGetFeature` for WFS queries with OGC filters (#5252)
* New `renderMode` option for `ol.layer.VectorTile` to balance between rendering performance and rendering quality (#5177)
* More flexibility for configuring attribution logos by allowing HTML elements (#5274)
* UTFGrid updates, now supporting Mapbox API v4 (#5329)
* New `condition` option for `ol.interaction.Modify` for better reliability when combining with other interactions (#5320)
In addition to these new features, the code base has been simplified and refactored in the process of removing the dependency on Closure Library and Compiler.
## Upgrade notes
#### Rendering change for tile sources
Previously, if you called `source.setUrl()` on a tile source, all currently rendered tiles would be cleared before new tiles were loaded and rendered. This clearing of the map is undesirable if you are trying to smoothly update the tiles used by a source. This behavior has now changed, and calling `source.setUrl()` (or `source.setUrls()`) will *not* clear currently rendered tiles before loading and rendering new tiles. Instead, previously rendered tiles remain rendered until new tiles have loaded and can replace them. If you want to achieve the old behavior (render a blank map before loading new tiles), you can call `source.refresh()` or you can replace the old source with a new one (using `layer.setSource()`).
#### Move of typedefs out of code and into separate file
This change should not affect the great majority of application developers, but it's possible there are edge cases when compiling application code together with the library which cause compiler errors or warnings. In this case, please raise a GitHub issue. `goog.require`s for typedefs should not be necessary.
Users compiling their code with the library should note that the following API `@typedef`s have been renamed; your code may need changing if you use these:
* `ol.format.WFS.FeatureCollectionMetadata` to `ol.WFSFeatureCollectionMetadata`
* `ol.format.WFS.TransactionResponse` to `ol.WFSTransactionResponse`
#### Removal of `opaque` option for `ol.source.VectorTile`
This option is no longer needed, so it was removed from the API.
#### XHR loading for `ol.source.TileUTFGrid`
The `ol.source.TileUTFGrid` now uses XMLHttpRequest to load UTFGrid tiles by default. This works out of the box with the v4 Mapbox API. To work with the v3 API, you must use the new `jsonp` option on the source. See the examples below for detail.
```js
// To work with the v4 API
var v4source = new ol.source.TileUTFGrid({
url: 'https://api.tiles.mapbox.com/v4/example.json?access_token=' + YOUR_KEY_HERE
});
// To work with the v3 API
var v3source = new ol.source.TileUTFGrid({
jsonp: true, // <--- this is required for v3
url: 'http://api.tiles.mapbox.com/v3/example.json'
});
```
## Full list of changes
* [#5377](https://github.com/openlayers/ol3/pull/5377) - Fix link to jspdf.min.js in export-pdf example ([@fredj](https://github.com/fredj))
* [#5372](https://github.com/openlayers/ol3/pull/5372) - Update jquery to version 2.2.4 🚀 ([@openlayers](https://github.com/openlayers))
* [#5364](https://github.com/openlayers/ol3/pull/5364) - Make it so things don't flash so much when you change the tile source URL. ([@tschaub](https://github.com/tschaub))
* [#5368](https://github.com/openlayers/ol3/pull/5368) - Move WFS typedefs to typedefs.js ([@probins](https://github.com/probins))
* [#5369](https://github.com/openlayers/ol3/pull/5369) - format/igc: Remove duplicate regex exec() call ([@Turbo87](https://github.com/Turbo87))
* [#5363](https://github.com/openlayers/ol3/pull/5363) - Convert all typedefs to CamelCase ([@probins](https://github.com/probins))
* [#5362](https://github.com/openlayers/ol3/pull/5362) - Update vector-tile to version 1.2.1 🚀 ([@openlayers](https://github.com/openlayers))
* [#5352](https://github.com/openlayers/ol3/pull/5352) - Add getResolutions() to ol.View ([@marlowp](https://github.com/marlowp))
* [#5359](https://github.com/openlayers/ol3/pull/5359) - Move upgrade notes to correct place ([@probins](https://github.com/probins))
* [#5343](https://github.com/openlayers/ol3/pull/5343) - Rename non-api sub-namespace typedefs ([@probins](https://github.com/probins))
* [#5361](https://github.com/openlayers/ol3/pull/5361) - Fix url to maki icons ([@fredj](https://github.com/fredj))
* [#5358](https://github.com/openlayers/ol3/pull/5358) - Handle multiple featureMember elements for different types (WFS format) ([@tsauerwein](https://github.com/tsauerwein))
* [#5355](https://github.com/openlayers/ol3/pull/5355) - Fix navigation-controls example description ([@fredj](https://github.com/fredj))
* [#5353](https://github.com/openlayers/ol3/pull/5353) - Add API definition to docs landing page ([@probins](https://github.com/probins))
* [#5356](https://github.com/openlayers/ol3/pull/5356) - Update rbush to version 1.4.3 🚀 ([@openlayers](https://github.com/openlayers))
* [#5354](https://github.com/openlayers/ol3/pull/5354) - Update eslint to version 2.10.2 🚀 ([@openlayers](https://github.com/openlayers))
* [#5347](https://github.com/openlayers/ol3/pull/5347) - Update eslint to version 2.10.1 🚀 ([@openlayers](https://github.com/openlayers))
* [#5344](https://github.com/openlayers/ol3/pull/5344) - Remove raster enum from test ([@probins](https://github.com/probins))
* [#5329](https://github.com/openlayers/ol3/pull/5329) - UTFGrid updates. ([@tschaub](https://github.com/tschaub))
* [#5335](https://github.com/openlayers/ol3/pull/5335) - Move typedefs to separate file ([@probins](https://github.com/probins))
* [#5332](https://github.com/openlayers/ol3/pull/5332) - Warn when viewing an outdated example, and offer a redirect to latest ([@ahocevar](https://github.com/ahocevar))
* [#5342](https://github.com/openlayers/ol3/pull/5342) - Fix incorrect source links ([@ahocevar](https://github.com/ahocevar))
* [#5339](https://github.com/openlayers/ol3/pull/5339) - Use a div instead of alert for version warning ([@ahocevar](https://github.com/ahocevar))
* [#5320](https://github.com/openlayers/ol3/pull/5320) - Add a 'condition' option to ol.interaction.Modify ([@fredj](https://github.com/fredj))
* [#5333](https://github.com/openlayers/ol3/pull/5333) - Improve code readability with better comments ([@openlayers](https://github.com/openlayers))
* [#5330](https://github.com/openlayers/ol3/pull/5330) - Fix source links, display version and warn about outdated docs ([@ahocevar](https://github.com/ahocevar))
* [#5324](https://github.com/openlayers/ol3/pull/5324) - Remove unneeded goog.provides/requires for typedefs ([@probins](https://github.com/probins))
* [#5328](https://github.com/openlayers/ol3/pull/5328) - Use Node 6 on Travis. ([@tschaub](https://github.com/tschaub))
* [#5313](https://github.com/openlayers/ol3/pull/5313) - Rastersource framestate extent ([@ahocevar](https://github.com/ahocevar))
* [#5326](https://github.com/openlayers/ol3/pull/5326) - Fix wording in tile-load-event example ([@tsauerwein](https://github.com/tsauerwein))
* [#5327](https://github.com/openlayers/ol3/pull/5327) - Update closure-util to version 1.13.1 🚀 ([@openlayers](https://github.com/openlayers))
* [#5289](https://github.com/openlayers/ol3/pull/5289) - Update fs-extra to version 0.30.0 🚀 ([@openlayers](https://github.com/openlayers))
* [#5319](https://github.com/openlayers/ol3/pull/5319) - Remove outdated fixme from framestate.js. ([@probins](https://github.com/probins))
* [#5274](https://github.com/openlayers/ol3/pull/5274) - Allow using elements in logo attribution options ([@samuellapointe](https://github.com/samuellapointe))
* [#5162](https://github.com/openlayers/ol3/pull/5162) - Improve docs/examples for loadingstrategy ([@probins](https://github.com/probins))
* [#5314](https://github.com/openlayers/ol3/pull/5314) - Update browserify to version 13.0.1 🚀 ([@openlayers](https://github.com/openlayers))
* [#5315](https://github.com/openlayers/ol3/pull/5315) - Remove unused ol.TileCoordTransformType ([@probins](https://github.com/probins))
* [#5310](https://github.com/openlayers/ol3/pull/5310) - Get raster sources working again. ([@tschaub](https://github.com/tschaub))
* [#5291](https://github.com/openlayers/ol3/pull/5291) - Allow once listeners to dispatch events of same type ([@ahocevar](https://github.com/ahocevar))
* [#5309](https://github.com/openlayers/ol3/pull/5309) - Update metalsmith-layouts to version 1.6.5 🚀 ([@openlayers](https://github.com/openlayers))
* [#5052](https://github.com/openlayers/ol3/pull/5052) - Update fs-extra to version 0.26.7 🚀 ([@openlayers](https://github.com/openlayers))
* [#5306](https://github.com/openlayers/ol3/pull/5306) - Make olx.view.FitOptions.padding optional ([@gberaudo](https://github.com/gberaudo))
* [#5302](https://github.com/openlayers/ol3/pull/5302) - Remove use of goog.partial ([@fredj](https://github.com/fredj))
* [#5304](https://github.com/openlayers/ol3/pull/5304) - Update sinon to version 1.17.4 🚀 ([@openlayers](https://github.com/openlayers))
* [#4644](https://github.com/openlayers/ol3/pull/4644) - Remove check-requires script ([@fredj](https://github.com/fredj))
* [#5298](https://github.com/openlayers/ol3/pull/5298) - Update eslint to version 2.9.0 🚀 ([@openlayers](https://github.com/openlayers))
* [#5296](https://github.com/openlayers/ol3/pull/5296) - Document handling of KML MultiGeometries ([@probins](https://github.com/probins))
* [#5293](https://github.com/openlayers/ol3/pull/5293) - Block removePoint while dragging ([@giohappy](https://github.com/giohappy))
* [#5285](https://github.com/openlayers/ol3/pull/5285) - Add more tests for the scaleline control ([@marcjansen](https://github.com/marcjansen))
* [#5287](https://github.com/openlayers/ol3/pull/5287) - Add and fix vectortile tests ([@ahocevar](https://github.com/ahocevar))
* [#5288](https://github.com/openlayers/ol3/pull/5288) - Expose removeVertex_ as removePoint ([@giohappy](https://github.com/giohappy))
* [#5286](https://github.com/openlayers/ol3/pull/5286) - Skip unnecessary render functions ([@ahocevar](https://github.com/ahocevar))
* [#5177](https://github.com/openlayers/ol3/pull/5177) - Add render options for vector tile layers ([@ahocevar](https://github.com/ahocevar))
* [#5278](https://github.com/openlayers/ol3/pull/5278) - Fix invalid generics type instantiation ([@fredj](https://github.com/fredj))
* [#5044](https://github.com/openlayers/ol3/pull/5044) - Snap interaction now handle feature without geometry properly ([@fblackburn](https://github.com/fblackburn))
* [#5277](https://github.com/openlayers/ol3/pull/5277) - Type cleanup ([@fredj](https://github.com/fredj))
* [#5275](https://github.com/openlayers/ol3/pull/5275) - Fix feature-layer association on replaced selections ([@ahocevar](https://github.com/ahocevar))
* [#5252](https://github.com/openlayers/ol3/pull/5252) - Add filter option to ol.format.WFS#writeGetFeature ([@tsauerwein](https://github.com/tsauerwein))
* [#5264](https://github.com/openlayers/ol3/pull/5264) - Fix for close draw polygon error ([@matjos](https://github.com/matjos))
* [#5267](https://github.com/openlayers/ol3/pull/5267) - Use ol.functions instead of goog.functions ([@ahocevar](https://github.com/ahocevar))
* [#5266](https://github.com/openlayers/ol3/pull/5266) - Document ol.colorlike ([@ahocevar](https://github.com/ahocevar))
* [#5261](https://github.com/openlayers/ol3/pull/5261) - add finishCondition to ol.interaction.Draw ([@giohappy](https://github.com/giohappy))
* [#5259](https://github.com/openlayers/ol3/pull/5259) - Include squash commit merges in changelog ([@ahocevar](https://github.com/ahocevar))
* [#5257](https://github.com/openlayers/ol3/pull/5257) - Add readFeatures and readProjection as MVT experimental API ([@bjornharrtell](https://github.com/bjornharrtell))
* [#3880](https://github.com/openlayers/ol3/pull/3880) - Add ol.source.ImageArcGISRest ([Anna Lambrechtsen](https://github.com/search?q=Anna Lambrechtsen&type=Users))
* [#5239](https://github.com/openlayers/ol3/pull/5239) - Update eslint to version 2.8.0 🚀 ([@openlayers](https://github.com/openlayers))
* [#5230](https://github.com/openlayers/ol3/pull/5230) - Reuse frame state arrays ([@fredj](https://github.com/fredj))
* [#5213](https://github.com/openlayers/ol3/pull/5213) - Remove unused ol.source.Source#setProjection function ([@fredj](https://github.com/fredj))
* [#5223](https://github.com/openlayers/ol3/pull/5223) - Create tmpSize_ before calling calculateTileRanges_ ([@fredj](https://github.com/fredj))
* [#5225](https://github.com/openlayers/ol3/pull/5225) - Remove unused ol.extent.transform2D function ([@fredj](https://github.com/fredj))
* [#5212](https://github.com/openlayers/ol3/pull/5212) - KML: fix GeometryCollection write ([@probins](https://github.com/probins))
* [#5228](https://github.com/openlayers/ol3/pull/5228) - Add 'layers' option to Translate interaction ([@adube](https://github.com/adube))
* [#5221](https://github.com/openlayers/ol3/pull/5221) - Update jquery, bootstrap and proj4js in examples ([@fredj](https://github.com/fredj))
* [#5227](https://github.com/openlayers/ol3/pull/5227) - Add a temporary ol.TileCoord in ol.renderer.canvas.TileLayer ([@fredj](https://github.com/fredj))
* [#5222](https://github.com/openlayers/ol3/pull/5222) - Remove unused private variables in ol.renderer.canvas.Map ([@fredj](https://github.com/fredj))
* [#5220](https://github.com/openlayers/ol3/pull/5220) - Externs cleanup ([@fredj](https://github.com/fredj))
* [#5224](https://github.com/openlayers/ol3/pull/5224) - Fix jsdoc tags indentation ([@fredj](https://github.com/fredj))
* [#5218](https://github.com/openlayers/ol3/pull/5218) - Add @api annotation to setConfig. ([@aisaacs](https://github.com/aisaacs))
* [#5215](https://github.com/openlayers/ol3/pull/5215) - Add an optional feature filter to getClosestFeatureToCoordinate ([@fredj](https://github.com/fredj))
* [#5132](https://github.com/openlayers/ol3/pull/5132) - Remove goog.string ([@nicholas-l](https://github.com/nicholas-l))
* [#5206](https://github.com/openlayers/ol3/pull/5206) - Minor correction of StyleFunction docs ([@probins](https://github.com/probins))
* [#4932](https://github.com/openlayers/ol3/pull/4932) - Remove undefined parameters to ol.format.WMSGetFeatureInfo#readFeatures_ ([@fredj](https://github.com/fredj))
* [#5207](https://github.com/openlayers/ol3/pull/5207) - Update clean-css to version 3.4.12 🚀 ([@openlayers](https://github.com/openlayers))
* [#5201](https://github.com/openlayers/ol3/pull/5201) - Small clarification for vector source loader docs ([@probins](https://github.com/probins))
* [#5200](https://github.com/openlayers/ol3/pull/5200) - Fix typo in rotate control for css classList ([@bartvde](https://github.com/bartvde))
* [#5178](https://github.com/openlayers/ol3/pull/5178) - Remove goog.global ([Nicholas Latham](https://github.com/search?q=Nicholas Latham&type=Users))
* [#5189](https://github.com/openlayers/ol3/pull/5189) - Add rendering tests to ensure correct circle and polygon rendering ([Andreas Hocevar](https://github.com/search?q=Andreas Hocevar&type=Users))
* [#5183](https://github.com/openlayers/ol3/pull/5183) - Update istanbul to version 0.4.3 🚀 ([@openlayers](https://github.com/openlayers))
* [#5187](https://github.com/openlayers/ol3/pull/5187) - Remove goog.functions.and from ol.interaction.Modify ([@fredj](https://github.com/fredj))
* [#5176](https://github.com/openlayers/ol3/pull/5176) - Update jquery to version 2.2.3 🚀 ([@openlayers](https://github.com/openlayers))
* [#5173](https://github.com/openlayers/ol3/pull/5173) - Use ol.dom.createCanvasContext2D ([@fredj](https://github.com/fredj))
* [#5171](https://github.com/openlayers/ol3/pull/5171) - Move olx.source.AttributionOption out of externs/olx.js ([@fredj](https://github.com/fredj))
* [#5170](https://github.com/openlayers/ol3/pull/5170) - Update eslint to version 2.7.0 🚀 ([@openlayers](https://github.com/openlayers))
* [#5167](https://github.com/openlayers/ol3/pull/5167) - Remove FastClick from mobile-full-screen example ([@fredj](https://github.com/fredj))
* [#5166](https://github.com/openlayers/ol3/pull/5166) - Remove jquery dependency from measure example ([@fredj](https://github.com/fredj))
* [#5164](https://github.com/openlayers/ol3/pull/5164) - Cartodb cleanup ([@fredj](https://github.com/fredj))
+1 -1
View File
@@ -6,7 +6,7 @@ docs: >
Example of exporting a map as a PDF using the <a href="https://github.com/MrRio/jsPDF" target="_blank">jsPDF</a> library. Example of exporting a map as a PDF using the <a href="https://github.com/MrRio/jsPDF" target="_blank">jsPDF</a> library.
tags: "export, pdf, openstreetmap" tags: "export, pdf, openstreetmap"
resources: resources:
- https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.2.61/jspdf.min.js - http://mrrio.github.io/jsPDF/dist/jspdf.min.js
--- ---
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "openlayers", "name": "openlayers",
"version": "3.16.0", "version": "3.16.0-alpha.2",
"description": "Build tools and sources for developing OpenLayers based mapping applications", "description": "Build tools and sources for developing OpenLayers based mapping applications",
"keywords": [ "keywords": [
"map", "map",
@@ -46,7 +46,7 @@
"pixelworks": "1.1.0", "pixelworks": "1.1.0",
"rbush": "1.4.3", "rbush": "1.4.3",
"temp": "0.8.3", "temp": "0.8.3",
"vector-tile": "1.2.1", "vector-tile": "1.2.0",
"walk": "2.3.9" "walk": "2.3.9"
}, },
"devDependencies": { "devDependencies": {
@@ -58,7 +58,7 @@
"expect.js": "0.3.1", "expect.js": "0.3.1",
"gaze": "^1.0.0", "gaze": "^1.0.0",
"istanbul": "0.4.3", "istanbul": "0.4.3",
"jquery": "2.2.4", "jquery": "2.2.3",
"mocha": "2.4.5", "mocha": "2.4.5",
"mocha-phantomjs-core": "^1.3.0", "mocha-phantomjs-core": "^1.3.0",
"mustache": "2.2.1", "mustache": "2.2.1",
+4 -4
View File
@@ -166,7 +166,7 @@ ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = {
@@ -179,7 +179,7 @@ ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
@@ -192,7 +192,7 @@ ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.BOX_PARSERS_ = { ol.format.GML2.prototype.BOX_PARSERS_ = {
@@ -205,7 +205,7 @@ ol.format.GML2.prototype.BOX_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.GEOMETRY_PARSERS_ = { ol.format.GML2.prototype.GEOMETRY_PARSERS_ = {
+22 -22
View File
@@ -450,7 +450,7 @@ ol.format.GML3.prototype.readFlatPosList_ = function(node, objectStack) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = {
@@ -463,7 +463,7 @@ ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
@@ -476,7 +476,7 @@ ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.GEOMETRY_PARSERS_ = { ol.format.GML3.prototype.GEOMETRY_PARSERS_ = {
@@ -506,7 +506,7 @@ ol.format.GML3.prototype.GEOMETRY_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.MULTICURVE_PARSERS_ = { ol.format.GML3.prototype.MULTICURVE_PARSERS_ = {
@@ -521,7 +521,7 @@ ol.format.GML3.prototype.MULTICURVE_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = { ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = {
@@ -536,7 +536,7 @@ ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = { ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = {
@@ -550,7 +550,7 @@ ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = { ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = {
@@ -563,7 +563,7 @@ ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.SURFACE_PARSERS_ = { ol.format.GML3.prototype.SURFACE_PARSERS_ = {
@@ -575,7 +575,7 @@ ol.format.GML3.prototype.SURFACE_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.CURVE_PARSERS_ = { ol.format.GML3.prototype.CURVE_PARSERS_ = {
@@ -587,7 +587,7 @@ ol.format.GML3.prototype.CURVE_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.ENVELOPE_PARSERS_ = { ol.format.GML3.prototype.ENVELOPE_PARSERS_ = {
@@ -602,7 +602,7 @@ ol.format.GML3.prototype.ENVELOPE_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.PATCHES_PARSERS_ = { ol.format.GML3.prototype.PATCHES_PARSERS_ = {
@@ -615,7 +615,7 @@ ol.format.GML3.prototype.PATCHES_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.SEGMENTS_PARSERS_ = { ol.format.GML3.prototype.SEGMENTS_PARSERS_ = {
@@ -712,7 +712,7 @@ ol.format.GML3.prototype.writePoint_ = function(node, geometry, objectStack) {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GML3.ENVELOPE_SERIALIZERS_ = { ol.format.GML3.ENVELOPE_SERIALIZERS_ = {
@@ -738,7 +738,7 @@ ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) {
} }
var keys = ['lowerCorner', 'upperCorner']; var keys = ['lowerCorner', 'upperCorner'];
var values = [extent[0] + ' ' + extent[1], extent[2] + ' ' + extent[3]]; var values = [extent[0] + ' ' + extent[1], extent[2] + ' ' + extent[3]];
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */
({node: node}), ol.format.GML3.ENVELOPE_SERIALIZERS_, ({node: node}), ol.format.GML3.ENVELOPE_SERIALIZERS_,
ol.xml.OBJECT_PROPERTY_NODE_FACTORY, ol.xml.OBJECT_PROPERTY_NODE_FACTORY,
values, values,
@@ -1019,7 +1019,7 @@ ol.format.GML3.prototype.writeGeometryElement = function(node, geometry, objectS
value = value =
ol.format.Feature.transformWithOptions(geometry, true, context); ol.format.Feature.transformWithOptions(geometry, true, context);
} }
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */
(item), ol.format.GML3.GEOMETRY_SERIALIZERS_, (item), ol.format.GML3.GEOMETRY_SERIALIZERS_,
this.GEOMETRY_NODE_FACTORY_, [value], this.GEOMETRY_NODE_FACTORY_, [value],
objectStack, undefined, this); objectStack, undefined, this);
@@ -1066,7 +1066,7 @@ ol.format.GML3.prototype.writeFeatureElement = function(node, feature, objectSta
} }
var item = ol.object.assign({}, context); var item = ol.object.assign({}, context);
item.node = node; item.node = node;
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */
(item), context.serializers, (item), context.serializers,
ol.xml.makeSimpleNodeFactory(undefined, featureNS), ol.xml.makeSimpleNodeFactory(undefined, featureNS),
values, values,
@@ -1091,7 +1091,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS
this.writeFeatureElement, this); this.writeFeatureElement, this);
var item = ol.object.assign({}, context); var item = ol.object.assign({}, context);
item.node = node; item.node = node;
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */
(item), (item),
serializers, serializers,
ol.xml.makeSimpleNodeFactory(featureType, featureNS), features, ol.xml.makeSimpleNodeFactory(featureType, featureNS), features,
@@ -1100,7 +1100,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GML3.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { ol.format.GML3.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = {
@@ -1114,7 +1114,7 @@ ol.format.GML3.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GML3.POINTMEMBER_SERIALIZERS_ = { ol.format.GML3.POINTMEMBER_SERIALIZERS_ = {
@@ -1126,7 +1126,7 @@ ol.format.GML3.POINTMEMBER_SERIALIZERS_ = {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GML3.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { ol.format.GML3.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = {
@@ -1140,7 +1140,7 @@ ol.format.GML3.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GML3.RING_SERIALIZERS_ = { ol.format.GML3.RING_SERIALIZERS_ = {
@@ -1152,7 +1152,7 @@ ol.format.GML3.RING_SERIALIZERS_ = {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GML3.GEOMETRY_SERIALIZERS_ = { ol.format.GML3.GEOMETRY_SERIALIZERS_ = {
+7 -7
View File
@@ -507,7 +507,7 @@ ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, object
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = { ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = {
@@ -522,7 +522,7 @@ ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = { ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = {
@@ -537,7 +537,7 @@ ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = { ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = {
@@ -552,7 +552,7 @@ ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = { ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = {
@@ -565,7 +565,7 @@ ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = { ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = {
@@ -578,7 +578,7 @@ ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = { ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = {
@@ -591,7 +591,7 @@ ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @protected * @protected
*/ */
ol.format.GMLBase.prototype.RING_PARSERS = { ol.format.GMLBase.prototype.RING_PARSERS = {
+19 -19
View File
@@ -279,7 +279,7 @@ ol.format.GPX.FEATURE_READER_ = {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.GPX_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.GPX_PARSERS_ = ol.xml.makeStructureNS(
@@ -292,7 +292,7 @@ ol.format.GPX.GPX_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.LINK_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.LINK_PARSERS_ = ol.xml.makeStructureNS(
@@ -306,7 +306,7 @@ ol.format.GPX.LINK_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.RTE_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.RTE_PARSERS_ = ol.xml.makeStructureNS(
@@ -326,7 +326,7 @@ ol.format.GPX.RTE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.RTEPT_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.RTEPT_PARSERS_ = ol.xml.makeStructureNS(
@@ -338,7 +338,7 @@ ol.format.GPX.RTEPT_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.TRK_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.TRK_PARSERS_ = ol.xml.makeStructureNS(
@@ -358,7 +358,7 @@ ol.format.GPX.TRK_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.TRKSEG_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.TRKSEG_PARSERS_ = ol.xml.makeStructureNS(
@@ -369,7 +369,7 @@ ol.format.GPX.TRKSEG_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.TRKPT_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.TRKPT_PARSERS_ = ol.xml.makeStructureNS(
@@ -381,7 +381,7 @@ ol.format.GPX.TRKPT_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.GPX.WPT_PARSERS_ = ol.xml.makeStructureNS( ol.format.GPX.WPT_PARSERS_ = ol.xml.makeStructureNS(
@@ -526,7 +526,7 @@ ol.format.GPX.writeLink_ = function(node, value, objectStack) {
properties['linkText'], properties['linkText'],
properties['linkType'] properties['linkType']
]; ];
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ({node: node}), ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ ({node: node}),
ol.format.GPX.LINK_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, ol.format.GPX.LINK_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY,
link, objectStack, ol.format.GPX.LINK_SEQUENCE_); link, objectStack, ol.format.GPX.LINK_SEQUENCE_);
}; };
@@ -571,7 +571,7 @@ ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) {
} }
var orderedKeys = ol.format.GPX.WPT_TYPE_SEQUENCE_[namespaceURI]; var orderedKeys = ol.format.GPX.WPT_TYPE_SEQUENCE_[namespaceURI];
var values = ol.xml.makeSequence(properties, orderedKeys); var values = ol.xml.makeSequence(properties, orderedKeys);
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */
({node: node, 'properties': properties}), ({node: node, 'properties': properties}),
ol.format.GPX.WPT_TYPE_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, ol.format.GPX.WPT_TYPE_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY,
values, objectStack, orderedKeys); values, objectStack, orderedKeys);
@@ -615,7 +615,7 @@ ol.format.GPX.writeRte_ = function(node, feature, objectStack) {
ol.format.GPX.writeTrk_ = function(node, feature, objectStack) { ol.format.GPX.writeTrk_ = function(node, feature, objectStack) {
var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]); var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]);
var properties = feature.getProperties(); var properties = feature.getProperties();
/** @type {ol.XmlNodeStackItem} */ /** @type {ol.xmlNodeStackItem} */
var context = {node: node, 'properties': properties}; var context = {node: node, 'properties': properties};
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
if (geometry) { if (geometry) {
@@ -641,7 +641,7 @@ ol.format.GPX.writeTrk_ = function(node, feature, objectStack) {
* @private * @private
*/ */
ol.format.GPX.writeTrkSeg_ = function(node, lineString, objectStack) { ol.format.GPX.writeTrkSeg_ = function(node, lineString, objectStack) {
/** @type {ol.XmlNodeStackItem} */ /** @type {ol.xmlNodeStackItem} */
var context = {node: node, 'geometryLayout': lineString.getLayout(), var context = {node: node, 'geometryLayout': lineString.getLayout(),
'properties': {}}; 'properties': {}};
ol.xml.pushSerializeAndPop(context, ol.xml.pushSerializeAndPop(context,
@@ -682,7 +682,7 @@ ol.format.GPX.LINK_SEQUENCE_ = ['text', 'type'];
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GPX.LINK_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.LINK_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -705,7 +705,7 @@ ol.format.GPX.RTE_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GPX.RTE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.RTE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -736,7 +736,7 @@ ol.format.GPX.TRK_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GPX.TRK_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.TRK_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -764,7 +764,7 @@ ol.format.GPX.TRKSEG_NODE_FACTORY_ = ol.xml.makeSimpleNodeFactory('trkpt');
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GPX.TRKSEG_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.TRKSEG_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -787,7 +787,7 @@ ol.format.GPX.WPT_TYPE_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GPX.WPT_TYPE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.WPT_TYPE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -855,7 +855,7 @@ ol.format.GPX.GPX_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.GPX.GPX_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.GPX_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -895,7 +895,7 @@ ol.format.GPX.prototype.writeFeaturesNode = function(features, opt_options) {
//FIXME Serialize metadata //FIXME Serialize metadata
var gpx = ol.xml.createElementNS('http://www.topografix.com/GPX/1/1', 'gpx'); var gpx = ol.xml.createElementNS('http://www.topografix.com/GPX/1/1', 'gpx');
ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */
({node: gpx}), ol.format.GPX.GPX_SERIALIZERS_, ({node: gpx}), ol.format.GPX.GPX_SERIALIZERS_,
ol.format.GPX.GPX_NODE_FACTORY_, features, [opt_options]); ol.format.GPX.GPX_NODE_FACTORY_, features, [opt_options]);
return gpx; return gpx;
+1
View File
@@ -172,6 +172,7 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
m = ol.format.IGC.H_RECORD_RE_.exec(line); m = ol.format.IGC.H_RECORD_RE_.exec(line);
if (m) { if (m) {
properties[m[1]] = m[2].trim(); properties[m[1]] = m[2].trim();
m = ol.format.IGC.HFDTE_RECORD_RE_.exec(line);
} }
} }
} }
+49 -49
View File
@@ -1401,7 +1401,7 @@ ol.format.KML.whenParser_ = function(node, objectStack) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.DATA_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.DATA_PARSERS_ = ol.xml.makeStructureNS(
@@ -1412,7 +1412,7 @@ ol.format.KML.DATA_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.EXTENDED_DATA_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.EXTENDED_DATA_PARSERS_ = ol.xml.makeStructureNS(
@@ -1424,7 +1424,7 @@ ol.format.KML.EXTENDED_DATA_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_ = ol.xml.makeStructureNS(
@@ -1436,7 +1436,7 @@ ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.FLAT_LINEAR_RING_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.FLAT_LINEAR_RING_PARSERS_ = ol.xml.makeStructureNS(
@@ -1447,7 +1447,7 @@ ol.format.KML.FLAT_LINEAR_RING_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.FLAT_LINEAR_RINGS_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.FLAT_LINEAR_RINGS_PARSERS_ = ol.xml.makeStructureNS(
@@ -1459,7 +1459,7 @@ ol.format.KML.FLAT_LINEAR_RINGS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.GX_TRACK_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.GX_TRACK_PARSERS_ = ol.xml.makeStructureNS(
@@ -1473,7 +1473,7 @@ ol.format.KML.GX_TRACK_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_ = ol.xml.makeStructureNS(
@@ -1484,7 +1484,7 @@ ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.ICON_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.ICON_PARSERS_ = ol.xml.makeStructureNS(
@@ -1501,7 +1501,7 @@ ol.format.KML.ICON_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.ICON_STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.ICON_STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -1515,7 +1515,7 @@ ol.format.KML.ICON_STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.INNER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.INNER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS(
@@ -1526,7 +1526,7 @@ ol.format.KML.INNER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.LABEL_STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.LABEL_STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -1538,7 +1538,7 @@ ol.format.KML.LABEL_STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.LINE_STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.LINE_STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -1550,7 +1550,7 @@ ol.format.KML.LINE_STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.MULTI_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.MULTI_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS(
@@ -1565,7 +1565,7 @@ ol.format.KML.MULTI_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS(
@@ -1576,7 +1576,7 @@ ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.NETWORK_LINK_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.NETWORK_LINK_PARSERS_ = ol.xml.makeStructureNS(
@@ -1594,7 +1594,7 @@ ol.format.KML.NETWORK_LINK_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.LINK_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.LINK_PARSERS_ = ol.xml.makeStructureNS(
@@ -1605,7 +1605,7 @@ ol.format.KML.LINK_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.OUTER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.OUTER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS(
@@ -1616,7 +1616,7 @@ ol.format.KML.OUTER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.PAIR_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.PAIR_PARSERS_ = ol.xml.makeStructureNS(
@@ -1629,7 +1629,7 @@ ol.format.KML.PAIR_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeStructureNS(
@@ -1666,7 +1666,7 @@ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -1679,7 +1679,7 @@ ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.SCHEMA_DATA_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.SCHEMA_DATA_PARSERS_ = ol.xml.makeStructureNS(
@@ -1690,7 +1690,7 @@ ol.format.KML.SCHEMA_DATA_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -1704,7 +1704,7 @@ ol.format.KML.STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.KML.STYLE_MAP_PARSERS_ = ol.xml.makeStructureNS( ol.format.KML.STYLE_MAP_PARSERS_ = ol.xml.makeStructureNS(
@@ -2161,7 +2161,7 @@ ol.format.KML.writeCoordinatesTextNode_ = function(node, coordinates, objectStac
* @private * @private
*/ */
ol.format.KML.writeDocument_ = function(node, features, objectStack) { ol.format.KML.writeDocument_ = function(node, features, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
ol.xml.pushSerializeAndPop(context, ol.format.KML.DOCUMENT_SERIALIZERS_, ol.xml.pushSerializeAndPop(context, ol.format.KML.DOCUMENT_SERIALIZERS_,
ol.format.KML.DOCUMENT_NODE_FACTORY_, features, objectStack, undefined, ol.format.KML.DOCUMENT_NODE_FACTORY_, features, objectStack, undefined,
this); this);
@@ -2175,7 +2175,7 @@ ol.format.KML.writeDocument_ = function(node, features, objectStack) {
* @private * @private
*/ */
ol.format.KML.writeIcon_ = function(node, icon, objectStack) { ol.format.KML.writeIcon_ = function(node, icon, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys = ol.format.KML.ICON_SEQUENCE_[parentNode.namespaceURI]; var orderedKeys = ol.format.KML.ICON_SEQUENCE_[parentNode.namespaceURI];
var values = ol.xml.makeSequence(icon, orderedKeys); var values = ol.xml.makeSequence(icon, orderedKeys);
@@ -2197,7 +2197,7 @@ ol.format.KML.writeIcon_ = function(node, icon, objectStack) {
* @private * @private
*/ */
ol.format.KML.writeIconStyle_ = function(node, style, objectStack) { ol.format.KML.writeIconStyle_ = function(node, style, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
var properties = {}; var properties = {};
var src = style.getSrc(); var src = style.getSrc();
var size = style.getSize(); var size = style.getSize();
@@ -2255,7 +2255,7 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) {
* @private * @private
*/ */
ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) { ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
var properties = {}; var properties = {};
var fill = style.getFill(); var fill = style.getFill();
if (fill) { if (fill) {
@@ -2281,7 +2281,7 @@ ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) {
* @private * @private
*/ */
ol.format.KML.writeLineStyle_ = function(node, style, objectStack) { ol.format.KML.writeLineStyle_ = function(node, style, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
var properties = { var properties = {
'color': style.getColor(), 'color': style.getColor(),
'width': style.getWidth() 'width': style.getWidth()
@@ -2308,7 +2308,7 @@ ol.format.KML.writeMultiGeometry_ = function(node, geometry, objectStack) {
(geometry instanceof ol.geom.MultiPolygon), (geometry instanceof ol.geom.MultiPolygon),
'geometry should be one of: ol.geom.GeometryCollection, ' + 'geometry should be one of: ol.geom.GeometryCollection, ' +
'ol.geom.MultiPoint, ol.geom.MultiLineString or ol.geom.MultiPolygon'); 'ol.geom.MultiPoint, ol.geom.MultiLineString or ol.geom.MultiPolygon');
/** @type {ol.XmlNodeStackItem} */ /** @type {ol.xmlNodeStackItem} */
var context = {node: node}; var context = {node: node};
var type = geometry.getType(); var type = geometry.getType();
/** @type {Array.<ol.geom.Geometry>} */ /** @type {Array.<ol.geom.Geometry>} */
@@ -2346,7 +2346,7 @@ ol.format.KML.writeMultiGeometry_ = function(node, geometry, objectStack) {
* @private * @private
*/ */
ol.format.KML.writeBoundaryIs_ = function(node, linearRing, objectStack) { ol.format.KML.writeBoundaryIs_ = function(node, linearRing, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
ol.xml.pushSerializeAndPop(context, ol.xml.pushSerializeAndPop(context,
ol.format.KML.BOUNDARY_IS_SERIALIZERS_, ol.format.KML.BOUNDARY_IS_SERIALIZERS_,
ol.format.KML.LINEAR_RING_NODE_FACTORY_, [linearRing], objectStack); ol.format.KML.LINEAR_RING_NODE_FACTORY_, [linearRing], objectStack);
@@ -2363,7 +2363,7 @@ ol.format.KML.writeBoundaryIs_ = function(node, linearRing, objectStack) {
* @private * @private
*/ */
ol.format.KML.writePlacemark_ = function(node, feature, objectStack) { ol.format.KML.writePlacemark_ = function(node, feature, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
// set id // set id
if (feature.getId()) { if (feature.getId()) {
@@ -2421,7 +2421,7 @@ ol.format.KML.writePrimitiveGeometry_ = function(node, geometry, objectStack) {
'geometry should be one of ol.geom.Point, ol.geom.LineString ' + 'geometry should be one of ol.geom.Point, ol.geom.LineString ' +
'or ol.geom.LinearRing'); 'or ol.geom.LinearRing');
var flatCoordinates = geometry.getFlatCoordinates(); var flatCoordinates = geometry.getFlatCoordinates();
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
context['layout'] = geometry.getLayout(); context['layout'] = geometry.getLayout();
context['stride'] = geometry.getStride(); context['stride'] = geometry.getStride();
ol.xml.pushSerializeAndPop(context, ol.xml.pushSerializeAndPop(context,
@@ -2444,7 +2444,7 @@ ol.format.KML.writePolygon_ = function(node, polygon, objectStack) {
goog.asserts.assert(linearRings.length > 0, goog.asserts.assert(linearRings.length > 0,
'linearRings should not be empty'); 'linearRings should not be empty');
var outerRing = linearRings.shift(); var outerRing = linearRings.shift();
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
// inner rings // inner rings
ol.xml.pushSerializeAndPop(context, ol.xml.pushSerializeAndPop(context,
ol.format.KML.POLYGON_SERIALIZERS_, ol.format.KML.POLYGON_SERIALIZERS_,
@@ -2465,7 +2465,7 @@ ol.format.KML.writePolygon_ = function(node, polygon, objectStack) {
* @private * @private
*/ */
ol.format.KML.writePolyStyle_ = function(node, style, objectStack) { ol.format.KML.writePolyStyle_ = function(node, style, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
ol.xml.pushSerializeAndPop(context, ol.format.KML.POLY_STYLE_SERIALIZERS_, ol.xml.pushSerializeAndPop(context, ol.format.KML.POLY_STYLE_SERIALIZERS_,
ol.format.KML.COLOR_NODE_FACTORY_, [style.getColor()], objectStack); ol.format.KML.COLOR_NODE_FACTORY_, [style.getColor()], objectStack);
}; };
@@ -2490,7 +2490,7 @@ ol.format.KML.writeScaleTextNode_ = function(node, scale) {
* @private * @private
*/ */
ol.format.KML.writeStyle_ = function(node, style, objectStack) { ol.format.KML.writeStyle_ = function(node, style, objectStack) {
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.xmlNodeStackItem} */ context = {node: node};
var properties = {}; var properties = {};
var fillStyle = style.getFill(); var fillStyle = style.getFill();
var strokeStyle = style.getStroke(); var strokeStyle = style.getStroke();
@@ -2542,7 +2542,7 @@ ol.format.KML.KML_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.KML_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.KML_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2554,7 +2554,7 @@ ol.format.KML.KML_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.DOCUMENT_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.DOCUMENT_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2596,7 +2596,7 @@ ol.format.KML.ICON_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.ICON_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.ICON_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2624,7 +2624,7 @@ ol.format.KML.ICON_STYLE_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.ICON_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.ICON_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2649,7 +2649,7 @@ ol.format.KML.LABEL_STYLE_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.LABEL_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.LABEL_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2672,7 +2672,7 @@ ol.format.KML.LINE_STYLE_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.LINE_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.LINE_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2684,7 +2684,7 @@ ol.format.KML.LINE_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.BOUNDARY_IS_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.BOUNDARY_IS_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2696,7 +2696,7 @@ ol.format.KML.BOUNDARY_IS_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.MULTI_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.MULTI_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2725,7 +2725,7 @@ ol.format.KML.PLACEMARK_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.PLACEMARK_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.PLACEMARK_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2755,7 +2755,7 @@ ol.format.KML.PLACEMARK_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2767,7 +2767,7 @@ ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.POLYGON_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.POLYGON_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2781,7 +2781,7 @@ ol.format.KML.POLYGON_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.POLY_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.POLY_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2803,7 +2803,7 @@ ol.format.KML.STYLE_SEQUENCE_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.KML.STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.KML.STYLE_SERIALIZERS_ = ol.xml.makeStructureNS(
@@ -2982,7 +2982,7 @@ ol.format.KML.prototype.writeFeaturesNode = function(features, opt_options) {
ol.xml.setAttributeNS(kml, xmlSchemaInstanceUri, 'xsi:schemaLocation', ol.xml.setAttributeNS(kml, xmlSchemaInstanceUri, 'xsi:schemaLocation',
ol.format.KML.SCHEMA_LOCATION_); ol.format.KML.SCHEMA_LOCATION_);
var /** @type {ol.XmlNodeStackItem} */ context = {node: kml}; var /** @type {ol.xmlNodeStackItem} */ context = {node: kml};
var properties = {}; var properties = {};
if (features.length > 1) { if (features.length > 1) {
properties['Document'] = features; properties['Document'] = features;
+3 -3
View File
@@ -165,7 +165,7 @@ ol.format.OSMXML.NAMESPACE_URIS_ = [
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OSMXML.WAY_PARSERS_ = ol.xml.makeStructureNS( ol.format.OSMXML.WAY_PARSERS_ = ol.xml.makeStructureNS(
@@ -177,7 +177,7 @@ ol.format.OSMXML.WAY_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OSMXML.PARSERS_ = ol.xml.makeStructureNS( ol.format.OSMXML.PARSERS_ = ol.xml.makeStructureNS(
@@ -189,7 +189,7 @@ ol.format.OSMXML.PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OSMXML.NODE_PARSERS_ = ol.xml.makeStructureNS( ol.format.OSMXML.NODE_PARSERS_ = ol.xml.makeStructureNS(
+14 -14
View File
@@ -302,7 +302,7 @@ ol.format.OWS.NAMESPACE_URIS_ = [
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.PARSERS_ = ol.xml.makeStructureNS(
@@ -318,7 +318,7 @@ ol.format.OWS.PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.ADDRESS_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.ADDRESS_PARSERS_ = ol.xml.makeStructureNS(
@@ -337,7 +337,7 @@ ol.format.OWS.ADDRESS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.ALLOWED_VALUES_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.ALLOWED_VALUES_PARSERS_ = ol.xml.makeStructureNS(
@@ -348,7 +348,7 @@ ol.format.OWS.ALLOWED_VALUES_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.CONSTRAINT_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.CONSTRAINT_PARSERS_ = ol.xml.makeStructureNS(
@@ -360,7 +360,7 @@ ol.format.OWS.CONSTRAINT_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.CONTACT_INFO_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.CONTACT_INFO_PARSERS_ = ol.xml.makeStructureNS(
@@ -372,7 +372,7 @@ ol.format.OWS.CONTACT_INFO_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.DCP_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.DCP_PARSERS_ = ol.xml.makeStructureNS(
@@ -383,7 +383,7 @@ ol.format.OWS.DCP_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.HTTP_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.HTTP_PARSERS_ = ol.xml.makeStructureNS(
@@ -395,7 +395,7 @@ ol.format.OWS.HTTP_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.OPERATION_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.OPERATION_PARSERS_ = ol.xml.makeStructureNS(
@@ -406,7 +406,7 @@ ol.format.OWS.OPERATION_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.OPERATIONS_METADATA_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.OPERATIONS_METADATA_PARSERS_ = ol.xml.makeStructureNS(
@@ -417,7 +417,7 @@ ol.format.OWS.OPERATIONS_METADATA_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.PHONE_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.PHONE_PARSERS_ = ol.xml.makeStructureNS(
@@ -429,7 +429,7 @@ ol.format.OWS.PHONE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.REQUEST_METHOD_PARSERS_ = ol.xml.makeStructureNS( ol.format.OWS.REQUEST_METHOD_PARSERS_ = ol.xml.makeStructureNS(
@@ -441,7 +441,7 @@ ol.format.OWS.REQUEST_METHOD_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.SERVICE_CONTACT_PARSERS_ = ol.format.OWS.SERVICE_CONTACT_PARSERS_ =
@@ -457,7 +457,7 @@ ol.format.OWS.SERVICE_CONTACT_PARSERS_ =
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_ = ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_ =
@@ -472,7 +472,7 @@ ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_ =
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.OWS.SERVICE_PROVIDER_PARSERS_ = ol.format.OWS.SERVICE_PROVIDER_PARSERS_ =
+16 -16
View File
@@ -130,7 +130,7 @@ ol.format.WFS.prototype.readFeaturesFromNode = function(node, opt_options) {
* Read transaction response of the source. * Read transaction response of the source.
* *
* @param {Document|Node|Object|string} source Source. * @param {Document|Node|Object|string} source Source.
* @return {ol.WFSTransactionResponse|undefined} Transaction response. * @return {ol.format.WFS.TransactionResponse|undefined} Transaction response.
* @api stable * @api stable
*/ */
ol.format.WFS.prototype.readTransactionResponse = function(source) { ol.format.WFS.prototype.readTransactionResponse = function(source) {
@@ -153,7 +153,7 @@ ol.format.WFS.prototype.readTransactionResponse = function(source) {
* Read feature collection metadata of the source. * Read feature collection metadata of the source.
* *
* @param {Document|Node|Object|string} source Source. * @param {Document|Node|Object|string} source Source.
* @return {ol.WFSFeatureCollectionMetadata|undefined} * @return {ol.format.WFS.FeatureCollectionMetadata|undefined}
* FeatureCollection metadata. * FeatureCollection metadata.
* @api stable * @api stable
*/ */
@@ -176,7 +176,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadata = function(source) {
/** /**
* @param {Document} doc Document. * @param {Document} doc Document.
* @return {ol.WFSFeatureCollectionMetadata|undefined} * @return {ol.format.WFS.FeatureCollectionMetadata|undefined}
* FeatureCollection metadata. * FeatureCollection metadata.
*/ */
ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc) { ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc) {
@@ -193,7 +193,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = { ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = {
@@ -206,7 +206,7 @@ ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = {
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @return {ol.WFSFeatureCollectionMetadata|undefined} * @return {ol.format.WFS.FeatureCollectionMetadata|undefined}
* FeatureCollection metadata. * FeatureCollection metadata.
*/ */
ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) { ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) {
@@ -219,14 +219,14 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) {
node.getAttribute('numberOfFeatures')); node.getAttribute('numberOfFeatures'));
result['numberOfFeatures'] = value; result['numberOfFeatures'] = value;
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {ol.WFSFeatureCollectionMetadata} */ (result), /** @type {ol.format.WFS.FeatureCollectionMetadata} */ (result),
ol.format.WFS.FEATURE_COLLECTION_PARSERS_, node, [], this.gmlFormat_); ol.format.WFS.FEATURE_COLLECTION_PARSERS_, node, [], this.gmlFormat_);
}; };
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WFS.TRANSACTION_SUMMARY_PARSERS_ = { ol.format.WFS.TRANSACTION_SUMMARY_PARSERS_ = {
@@ -255,7 +255,7 @@ ol.format.WFS.readTransactionSummary_ = function(node, objectStack) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WFS.OGC_FID_PARSERS_ = { ol.format.WFS.OGC_FID_PARSERS_ = {
@@ -279,7 +279,7 @@ ol.format.WFS.fidParser_ = function(node, objectStack) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WFS.INSERT_RESULTS_PARSERS_ = { ol.format.WFS.INSERT_RESULTS_PARSERS_ = {
@@ -303,7 +303,7 @@ ol.format.WFS.readInsertResults_ = function(node, objectStack) {
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_ = { ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_ = {
@@ -318,7 +318,7 @@ ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_ = {
/** /**
* @param {Document} doc Document. * @param {Document} doc Document.
* @return {ol.WFSTransactionResponse|undefined} Transaction response. * @return {ol.format.WFS.TransactionResponse|undefined} Transaction response.
*/ */
ol.format.WFS.prototype.readTransactionResponseFromDocument = function(doc) { ol.format.WFS.prototype.readTransactionResponseFromDocument = function(doc) {
goog.asserts.assert(doc.nodeType == goog.dom.NodeType.DOCUMENT, goog.asserts.assert(doc.nodeType == goog.dom.NodeType.DOCUMENT,
@@ -334,7 +334,7 @@ ol.format.WFS.prototype.readTransactionResponseFromDocument = function(doc) {
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @return {ol.WFSTransactionResponse|undefined} Transaction response. * @return {ol.format.WFS.TransactionResponse|undefined} Transaction response.
*/ */
ol.format.WFS.prototype.readTransactionResponseFromNode = function(node) { ol.format.WFS.prototype.readTransactionResponseFromNode = function(node) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT,
@@ -342,13 +342,13 @@ ol.format.WFS.prototype.readTransactionResponseFromNode = function(node) {
goog.asserts.assert(node.localName == 'TransactionResponse', goog.asserts.assert(node.localName == 'TransactionResponse',
'localName should be TransactionResponse'); 'localName should be TransactionResponse');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {ol.WFSTransactionResponse} */({}), /** @type {ol.format.WFS.TransactionResponse} */({}),
ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_, node, []); ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_, node, []);
}; };
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.WFS.QUERY_SERIALIZERS_ = { ol.format.WFS.QUERY_SERIALIZERS_ = {
@@ -497,7 +497,7 @@ ol.format.WFS.writeNative_ = function(node, nativeElement, objectStack) {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.WFS.TRANSACTION_SERIALIZERS_ = { ol.format.WFS.TRANSACTION_SERIALIZERS_ = {
@@ -722,7 +722,7 @@ ol.format.WFS.writeOgcLiteral_ = function(node, value) {
/** /**
* @type {Object.<string, Object.<string, ol.XmlSerializer>>} * @type {Object.<string, Object.<string, ol.xmlSerializer>>}
* @private * @private
*/ */
ol.format.WFS.GETFEATURE_SERIALIZERS_ = { ol.format.WFS.GETFEATURE_SERIALIZERS_ = {
+17 -17
View File
@@ -568,7 +568,7 @@ ol.format.WMSCapabilities.NAMESPACE_URIS_ = [
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.PARSERS_ = ol.xml.makeStructureNS(
@@ -582,7 +582,7 @@ ol.format.WMSCapabilities.PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.CAPABILITY_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.CAPABILITY_PARSERS_ = ol.xml.makeStructureNS(
@@ -598,7 +598,7 @@ ol.format.WMSCapabilities.CAPABILITY_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.SERVICE_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.SERVICE_PARSERS_ = ol.xml.makeStructureNS(
@@ -626,7 +626,7 @@ ol.format.WMSCapabilities.SERVICE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_ = ol.xml.makeStructureNS(
@@ -648,7 +648,7 @@ ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_ = ol.xml.makeStructureNS(
@@ -662,7 +662,7 @@ ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_ = ol.xml.makeStructureNS(
@@ -679,7 +679,7 @@ ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.EXCEPTION_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.EXCEPTION_PARSERS_ = ol.xml.makeStructureNS(
@@ -690,7 +690,7 @@ ol.format.WMSCapabilities.EXCEPTION_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS(
@@ -731,7 +731,7 @@ ol.format.WMSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_ = ol.xml.makeStructureNS(
@@ -746,7 +746,7 @@ ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ = ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ =
@@ -764,7 +764,7 @@ ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ =
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.REQUEST_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.REQUEST_PARSERS_ = ol.xml.makeStructureNS(
@@ -780,7 +780,7 @@ ol.format.WMSCapabilities.REQUEST_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_ = ol.xml.makeStructureNS(
@@ -793,7 +793,7 @@ ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.DCPTYPE_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.DCPTYPE_PARSERS_ = ol.xml.makeStructureNS(
@@ -805,7 +805,7 @@ ol.format.WMSCapabilities.DCPTYPE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.HTTP_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.HTTP_PARSERS_ = ol.xml.makeStructureNS(
@@ -819,7 +819,7 @@ ol.format.WMSCapabilities.HTTP_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -838,7 +838,7 @@ ol.format.WMSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ = ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ =
@@ -851,7 +851,7 @@ ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ =
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMSCapabilities.KEYWORDLIST_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMSCapabilities.KEYWORDLIST_PARSERS_ = ol.xml.makeStructureNS(
+9 -9
View File
@@ -277,7 +277,7 @@ ol.format.WMTSCapabilities.OWS_NAMESPACE_URIS_ = [
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.PARSERS_ = ol.xml.makeStructureNS(
@@ -289,7 +289,7 @@ ol.format.WMTSCapabilities.PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.CONTENTS_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.CONTENTS_PARSERS_ = ol.xml.makeStructureNS(
@@ -303,7 +303,7 @@ ol.format.WMTSCapabilities.CONTENTS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS(
@@ -332,7 +332,7 @@ ol.format.WMTSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS(
@@ -349,7 +349,7 @@ ol.format.WMTSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.TMS_LINKS_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.TMS_LINKS_PARSERS_ = ol.xml.makeStructureNS(
@@ -361,7 +361,7 @@ ol.format.WMTSCapabilities.TMS_LINKS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.DIMENSION_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.DIMENSION_PARSERS_ = ol.xml.makeStructureNS(
@@ -378,7 +378,7 @@ ol.format.WMTSCapabilities.DIMENSION_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.WGS84_BBOX_READERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.WGS84_BBOX_READERS_ = ol.xml.makeStructureNS(
@@ -392,7 +392,7 @@ ol.format.WMTSCapabilities.WGS84_BBOX_READERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.TMS_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.TMS_PARSERS_ = ol.xml.makeStructureNS(
@@ -411,7 +411,7 @@ ol.format.WMTSCapabilities.TMS_PARSERS_ = ol.xml.makeStructureNS(
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.XmlParser>>} * @type {Object.<string, Object.<string, ol.xmlParser>>}
* @private * @private
*/ */
ol.format.WMTSCapabilities.TM_PARSERS_ = ol.xml.makeStructureNS( ol.format.WMTSCapabilities.TM_PARSERS_ = ol.xml.makeStructureNS(
+11 -11
View File
@@ -71,31 +71,31 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, vi
/** /**
* @private * @private
* @type {?ol.CanvasFillState} * @type {?ol.canvasFillState}
*/ */
this.contextFillState_ = null; this.contextFillState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasStrokeState} * @type {?ol.canvasStrokeState}
*/ */
this.contextStrokeState_ = null; this.contextStrokeState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasTextState} * @type {?ol.canvasTextState}
*/ */
this.contextTextState_ = null; this.contextTextState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasFillState} * @type {?ol.canvasFillState}
*/ */
this.fillState_ = null; this.fillState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasStrokeState} * @type {?ol.canvasStrokeState}
*/ */
this.strokeState_ = null; this.strokeState_ = null;
@@ -203,19 +203,19 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, vi
/** /**
* @private * @private
* @type {?ol.CanvasFillState} * @type {?ol.canvasFillState}
*/ */
this.textFillState_ = null; this.textFillState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasStrokeState} * @type {?ol.canvasStrokeState}
*/ */
this.textStrokeState_ = null; this.textStrokeState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasTextState} * @type {?ol.canvasTextState}
*/ */
this.textState_ = null; this.textState_ = null;
@@ -700,7 +700,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(geometry) {
/** /**
* @param {ol.CanvasFillState} fillState Fill state. * @param {ol.canvasFillState} fillState Fill state.
* @private * @private
*/ */
ol.render.canvas.Immediate.prototype.setContextFillState_ = function(fillState) { ol.render.canvas.Immediate.prototype.setContextFillState_ = function(fillState) {
@@ -720,7 +720,7 @@ ol.render.canvas.Immediate.prototype.setContextFillState_ = function(fillState)
/** /**
* @param {ol.CanvasStrokeState} strokeState Stroke state. * @param {ol.canvasStrokeState} strokeState Stroke state.
* @private * @private
*/ */
ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeState) { ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeState) {
@@ -772,7 +772,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta
/** /**
* @param {ol.CanvasTextState} textState Text state. * @param {ol.canvasTextState} textState Text state.
* @private * @private
*/ */
ol.render.canvas.Immediate.prototype.setContextTextState_ = function(textState) { ol.render.canvas.Immediate.prototype.setContextTextState_ = function(textState) {
+9 -9
View File
@@ -1538,19 +1538,19 @@ ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) {
/** /**
* @private * @private
* @type {?ol.CanvasFillState} * @type {?ol.canvasFillState}
*/ */
this.replayFillState_ = null; this.replayFillState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasStrokeState} * @type {?ol.canvasStrokeState}
*/ */
this.replayStrokeState_ = null; this.replayStrokeState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasTextState} * @type {?ol.canvasTextState}
*/ */
this.replayTextState_ = null; this.replayTextState_ = null;
@@ -1586,19 +1586,19 @@ ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) {
/** /**
* @private * @private
* @type {?ol.CanvasFillState} * @type {?ol.canvasFillState}
*/ */
this.textFillState_ = null; this.textFillState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasStrokeState} * @type {?ol.canvasStrokeState}
*/ */
this.textStrokeState_ = null; this.textStrokeState_ = null;
/** /**
* @private * @private
* @type {?ol.CanvasTextState} * @type {?ol.canvasTextState}
*/ */
this.textState_ = null; this.textState_ = null;
@@ -1638,7 +1638,7 @@ ol.render.canvas.TextReplay.prototype.drawText = function(flatCoordinates, offse
/** /**
* @param {ol.CanvasFillState} fillState Fill state. * @param {ol.canvasFillState} fillState Fill state.
* @private * @private
*/ */
ol.render.canvas.TextReplay.prototype.setReplayFillState_ = function(fillState) { ol.render.canvas.TextReplay.prototype.setReplayFillState_ = function(fillState) {
@@ -1662,7 +1662,7 @@ ol.render.canvas.TextReplay.prototype.setReplayFillState_ = function(fillState)
/** /**
* @param {ol.CanvasStrokeState} strokeState Stroke state. * @param {ol.canvasStrokeState} strokeState Stroke state.
* @private * @private
*/ */
ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = function(strokeState) { ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = function(strokeState) {
@@ -1704,7 +1704,7 @@ ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = function(strokeSta
/** /**
* @param {ol.CanvasTextState} textState Text state. * @param {ol.canvasTextState} textState Text state.
* @private * @private
*/ */
ol.render.canvas.TextReplay.prototype.setReplayTextState_ = function(textState) { ol.render.canvas.TextReplay.prototype.setReplayTextState_ = function(textState) {
+2 -2
View File
@@ -104,7 +104,7 @@ ol.renderer.webgl.Map = function(container, map) {
/** /**
* @private * @private
* @type {ol.structs.LRUCache.<ol.WebglTextureCacheEntry|null>} * @type {ol.structs.LRUCache.<ol.webglTextureCacheEntry|null>}
*/ */
this.textureCache_ = new ol.structs.LRUCache(); this.textureCache_ = new ol.structs.LRUCache();
@@ -294,7 +294,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
if (!gl.isContextLost()) { if (!gl.isContextLost()) {
this.textureCache_.forEach( this.textureCache_.forEach(
/** /**
* @param {?ol.WebglTextureCacheEntry} textureCacheEntry * @param {?ol.webglTextureCacheEntry} textureCacheEntry
* Texture cache entry. * Texture cache entry.
*/ */
function(textureCacheEntry) { function(textureCacheEntry) {
+1 -1
View File
@@ -23,7 +23,7 @@ goog.require('ol.reproj.Triangulation');
* @param {ol.Extent} targetExtent Target extent. * @param {ol.Extent} targetExtent Target extent.
* @param {number} targetResolution Target resolution. * @param {number} targetResolution Target resolution.
* @param {number} pixelRatio Pixel ratio. * @param {number} pixelRatio Pixel ratio.
* @param {ol.ReprojImageFunctionType} getImageFunction * @param {ol.reprojImageFunctionType} getImageFunction
* Function returning source images (extent, resolution, pixelRatio). * Function returning source images (extent, resolution, pixelRatio).
*/ */
ol.reproj.Image = function(sourceProj, targetProj, ol.reproj.Image = function(sourceProj, targetProj,
+1 -1
View File
@@ -28,7 +28,7 @@ goog.require('ol.reproj.Triangulation');
* @param {ol.TileCoord} wrappedTileCoord Coordinate of the tile wrapped in X. * @param {ol.TileCoord} wrappedTileCoord Coordinate of the tile wrapped in X.
* @param {number} pixelRatio Pixel ratio. * @param {number} pixelRatio Pixel ratio.
* @param {number} gutter Gutter of the source tiles. * @param {number} gutter Gutter of the source tiles.
* @param {ol.ReprojTileFunctionType} getTileFunction * @param {ol.reprojTileFunctionType} getTileFunction
* Function returning source tiles (z, x, y, pixelRatio). * Function returning source tiles (z, x, y, pixelRatio).
* @param {number=} opt_errorThreshold Acceptable reprojection error (in px). * @param {number=} opt_errorThreshold Acceptable reprojection error (in px).
* @param {boolean=} opt_renderEdges Render reprojection edges. * @param {boolean=} opt_renderEdges Render reprojection edges.
+2 -2
View File
@@ -63,7 +63,7 @@ ol.reproj.Triangulation = function(sourceProj, targetProj, targetExtent,
this.errorThresholdSquared_ = errorThreshold * errorThreshold; this.errorThresholdSquared_ = errorThreshold * errorThreshold;
/** /**
* @type {Array.<ol.ReprojTriangle>} * @type {Array.<ol.reprojTriangle>}
* @private * @private
*/ */
this.triangles_ = []; this.triangles_ = [];
@@ -324,7 +324,7 @@ ol.reproj.Triangulation.prototype.calculateSourceExtent = function() {
/** /**
* @return {Array.<ol.ReprojTriangle>} Array of the calculated triangles. * @return {Array.<ol.reprojTriangle>} Array of the calculated triangles.
*/ */
ol.reproj.Triangulation.prototype.getTriangles = function() { ol.reproj.Triangulation.prototype.getTriangles = function() {
return this.triangles_; return this.triangles_;
+1 -1
View File
@@ -19,7 +19,7 @@ goog.require('ol.source.Source');
* *
* @constructor * @constructor
* @extends {ol.source.Source} * @extends {ol.source.Source}
* @param {ol.SourceImageOptions} options Single image source options. * @param {ol.sourceImageOptions} options Single image source options.
* @api * @api
*/ */
ol.source.Image = function(options) { ol.source.Image = function(options) {
+1 -1
View File
@@ -91,7 +91,7 @@ ol.source.Raster = function(options) {
/** /**
* The most recently rendered state. * The most recently rendered state.
* @type {?ol.SourceRasterRenderedState} * @type {?ol.sourceRasterRenderedState}
* @private * @private
*/ */
this.renderedState_ = null; this.renderedState_ = null;
+1 -1
View File
@@ -30,7 +30,7 @@ ol.source.State = {
* *
* @constructor * @constructor
* @extends {ol.Object} * @extends {ol.Object}
* @param {ol.SourceSourceOptions} options Source options. * @param {ol.sourceSourceOptions} options Source options.
* @api stable * @api stable
*/ */
ol.source.Source = function(options) { ol.source.Source = function(options) {
+1 -1
View File
@@ -22,7 +22,7 @@ goog.require('ol.tilegrid.TileGrid');
* *
* @constructor * @constructor
* @extends {ol.source.Source} * @extends {ol.source.Source}
* @param {ol.SourceTileOptions} options Tile source options. * @param {ol.sourceTileOptions} options Tile source options.
* @api * @api
*/ */
ol.source.Tile = function(options) { ol.source.Tile = function(options) {
+1 -1
View File
@@ -14,7 +14,7 @@ goog.require('ol.source.TileEvent');
* @constructor * @constructor
* @fires ol.source.TileEvent * @fires ol.source.TileEvent
* @extends {ol.source.Tile} * @extends {ol.source.Tile}
* @param {ol.SourceUrlTileOptions} options Image tile options. * @param {ol.sourceUrlTileOptions} options Image tile options.
*/ */
ol.source.UrlTile = function(options) { ol.source.UrlTile = function(options) {
+3 -3
View File
@@ -22,11 +22,11 @@ goog.require('ol.source.TileImage');
* *
* @constructor * @constructor
* @extends {ol.source.TileImage} * @extends {ol.source.TileImage}
* @param {olx.source.XYZOptions=} opt_options XYZ options. * @param {olx.source.XYZOptions} options XYZ options.
* @api stable * @api stable
*/ */
ol.source.XYZ = function(opt_options) { ol.source.XYZ = function(options) {
var options = opt_options || {}; options = options || {};
var projection = options.projection !== undefined ? var projection = options.projection !== undefined ?
options.projection : 'EPSG:3857'; options.projection : 'EPSG:3857';
+26
View File
@@ -0,0 +1,26 @@
/**
* typedefs for the WFS sub-sub-namespace
* See typedefs.js for more details
*/
goog.provide('ol.format.WFS.FeatureCollectionMetadata');
goog.provide('ol.format.WFS.TransactionResponse');
/**
* Number of features; bounds/extent.
* @typedef {{numberOfFeatures: number,
* bounds: ol.Extent}}
* @api stable
*/
ol.format.WFS.FeatureCollectionMetadata;
/**
* Total deleted; total inserted; total updated; array of insert ids.
* @typedef {{totalDeleted: number,
* totalInserted: number,
* totalUpdated: number,
* insertIds: Array.<string>}}
* @api stable
*/
ol.format.WFS.TransactionResponse;
+135 -152
View File
@@ -4,12 +4,15 @@
* These look like vars (or var properties), but in fact are simply identifiers * These look like vars (or var properties), but in fact are simply identifiers
* for the Closure compiler. Originally they were included in the appropriate * for the Closure compiler. Originally they were included in the appropriate
* namespace file, but with the move away from Closure namespaces and towards * namespace file, but with the move away from Closure namespaces and towards
* self-contained standard modules are now all in this file. * self-contained standard modules are now all in this file, with two exceptions.
* Unlike the other type definitions - enums and constructor functions - they * Unlike the other type definitions - enums and constructor functions - they
* are not code and so are not imported or exported. They are only referred to * are not code and so are not imported or exported. They are only referred to
* in type-defining comments used by the Closure compiler, and so should not * in type-defining comments used by the Closure compiler, and so should not
* appear in module code. * appear in module code.
* *
* The 2 exceptions are the WFS typedefs which are in a sub-sub-namespace and
* are API. These have been put in their own separate file.
*
* When the code is converted to ES6 modules, the namespace structure will * When the code is converted to ES6 modules, the namespace structure will
* disappear, and these typedefs will have to be renamed accordingly, but the * disappear, and these typedefs will have to be renamed accordingly, but the
* namespace structure is maintained for the present for backwards compatibility. * namespace structure is maintained for the present for backwards compatibility.
@@ -37,12 +40,6 @@ goog.provide('ol.style.AtlasBlock');
ol.AttributionLike; ol.AttributionLike;
/**
* @typedef {{fillStyle: ol.ColorLike}}
*/
ol.CanvasFillState;
/** /**
* A function returning the canvas element (`{HTMLCanvasElement}`) * A function returning the canvas element (`{HTMLCanvasElement}`)
* used by the source as an image. The arguments passed to the function are: * used by the source as an image. The arguments passed to the function are:
@@ -59,25 +56,6 @@ ol.CanvasFillState;
ol.CanvasFunctionType; ol.CanvasFunctionType;
/**
* @typedef {{lineCap: string,
* lineDash: Array.<number>,
* lineJoin: string,
* lineWidth: number,
* miterLimit: number,
* strokeStyle: string}}
*/
ol.CanvasStrokeState;
/**
* @typedef {{font: string,
* textAlign: string,
* textBaseline: string}}
*/
ol.CanvasTextState;
/** /**
* @typedef {function((ol.Coordinate|undefined)): (ol.Coordinate|undefined)} * @typedef {function((ol.Coordinate|undefined)): (ol.Coordinate|undefined)}
*/ */
@@ -291,27 +269,6 @@ ol.PostRenderFunction;
ol.PreRenderFunction; ol.PreRenderFunction;
/**
* @typedef {function(ol.Extent, number, number) : ol.ImageBase}
*/
ol.ReprojImageFunctionType;
/**
* @typedef {function(number, number, number, number) : ol.Tile}
*/
ol.ReprojTileFunctionType;
/**
* Single triangle; consists of 3 source points and 3 target points.
*
* @typedef {{source: Array.<ol.Coordinate>,
* target: Array.<ol.Coordinate>}}
*/
ol.ReprojTriangle;
/** /**
* @typedef {function((number|undefined), number, number): (number|undefined)} * @typedef {function((number|undefined), number, number): (number|undefined)}
*/ */
@@ -332,69 +289,6 @@ ol.RotationConstraintType;
ol.Size; ol.Size;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* extent: (null|ol.Extent|undefined),
* logo: (string|olx.LogoOptions|undefined),
* projection: ol.proj.ProjectionLike,
* resolutions: (Array.<number>|undefined),
* state: (ol.source.State|undefined)}}
*/
ol.SourceImageOptions;
/**
* @typedef {{revision: number,
* resolution: number,
* extent: ol.Extent}}
*/
ol.SourceRasterRenderedState;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* logo: (string|olx.LogoOptions|undefined),
* projection: ol.proj.ProjectionLike,
* state: (ol.source.State|undefined),
* wrapX: (boolean|undefined)}}
*/
ol.SourceSourceOptions;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* cacheSize: (number|undefined),
* extent: (ol.Extent|undefined),
* logo: (string|olx.LogoOptions|undefined),
* opaque: (boolean|undefined),
* tilePixelRatio: (number|undefined),
* projection: ol.proj.ProjectionLike,
* state: (ol.source.State|undefined),
* tileGrid: (ol.tilegrid.TileGrid|undefined),
* wrapX: (boolean|undefined)}}
*/
ol.SourceTileOptions;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* cacheSize: (number|undefined),
* extent: (ol.Extent|undefined),
* logo: (string|olx.LogoOptions|undefined),
* opaque: (boolean|undefined),
* projection: ol.proj.ProjectionLike,
* state: (ol.source.State|undefined),
* tileGrid: (ol.tilegrid.TileGrid|undefined),
* tileLoadFunction: ol.TileLoadFunctionType,
* tilePixelRatio: (number|undefined),
* tileUrlFunction: (ol.TileUrlFunctionType|undefined),
* url: (string|undefined),
* urls: (Array.<string>|undefined),
* wrapX: (boolean|undefined)}}
*/
ol.SourceUrlTileOptions;
/** /**
* An array of three numbers representing the location of a tile in a tile * An array of three numbers representing the location of a tile in a tile
* grid. The order is `z`, `x`, and `y`. `z` is the zoom level. * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
@@ -461,39 +355,6 @@ ol.TileUrlFunctionType;
ol.TransformFunction; ol.TransformFunction;
/**
* @typedef {{buf: ol.webgl.Buffer,
* buffer: WebGLBuffer}}
*/
ol.WebglBufferCacheEntry;
/**
* @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}}
*/
ol.WebglTextureCacheEntry;
/**
* Number of features; bounds/extent.
* @typedef {{numberOfFeatures: number,
* bounds: ol.Extent}}
* @api stable
*/
ol.WFSFeatureCollectionMetadata;
/**
* Total deleted; total inserted; total updated; array of insert ids.
* @typedef {{totalDeleted: number,
* totalInserted: number,
* totalUpdated: number,
* insertIds: Array.<string>}}
* @api stable
*/
ol.WFSTransactionResponse;
/** /**
* @typedef {{type: number, value: (number|string|undefined), position: number}} * @typedef {{type: number, value: (number|string|undefined), position: number}}
*/ */
@@ -501,24 +362,28 @@ ol.WKTToken;
/** /**
* When using {@link ol.xml.makeChildAppender} or * @typedef {{fillStyle: ol.ColorLike}}
* {@link ol.xml.makeSimpleNodeFactory}, the top `objectStack` item needs to
* have this structure.
* @typedef {{node:Node}}
*/ */
ol.XmlNodeStackItem; ol.canvasFillState;
/** /**
* @typedef {function(Node, Array.<*>)} * @typedef {{lineCap: string,
* lineDash: Array.<number>,
* lineJoin: string,
* lineWidth: number,
* miterLimit: number,
* strokeStyle: string}}
*/ */
ol.XmlParser; ol.canvasStrokeState;
/** /**
* @typedef {function(Node, *, Array.<*>)} * @typedef {{font: string,
* textAlign: string,
* textBaseline: string}}
*/ */
ol.XmlSerializer; ol.canvasTextState;
/** /**
@@ -664,6 +529,90 @@ ol.raster.Operation;
ol.raster.Pixel; ol.raster.Pixel;
/**
* @typedef {function(ol.Extent, number, number) : ol.ImageBase}
*/
ol.reprojImageFunctionType;
/**
* @typedef {function(number, number, number, number) : ol.Tile}
*/
ol.reprojTileFunctionType;
/**
* Single triangle; consists of 3 source points and 3 target points.
*
* @typedef {{source: Array.<ol.Coordinate>,
* target: Array.<ol.Coordinate>}}
*/
ol.reprojTriangle;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* extent: (null|ol.Extent|undefined),
* logo: (string|olx.LogoOptions|undefined),
* projection: ol.proj.ProjectionLike,
* resolutions: (Array.<number>|undefined),
* state: (ol.source.State|undefined)}}
*/
ol.sourceImageOptions;
/**
* @typedef {{revision: number,
* resolution: number,
* extent: ol.Extent}}
*/
ol.sourceRasterRenderedState;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* logo: (string|olx.LogoOptions|undefined),
* projection: ol.proj.ProjectionLike,
* state: (ol.source.State|undefined),
* wrapX: (boolean|undefined)}}
*/
ol.sourceSourceOptions;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* cacheSize: (number|undefined),
* extent: (ol.Extent|undefined),
* logo: (string|olx.LogoOptions|undefined),
* opaque: (boolean|undefined),
* tilePixelRatio: (number|undefined),
* projection: ol.proj.ProjectionLike,
* state: (ol.source.State|undefined),
* tileGrid: (ol.tilegrid.TileGrid|undefined),
* wrapX: (boolean|undefined)}}
*/
ol.sourceTileOptions;
/**
* @typedef {{attributions: (ol.AttributionLike|undefined),
* cacheSize: (number|undefined),
* extent: (ol.Extent|undefined),
* logo: (string|olx.LogoOptions|undefined),
* opaque: (boolean|undefined),
* projection: ol.proj.ProjectionLike,
* state: (ol.source.State|undefined),
* tileGrid: (ol.tilegrid.TileGrid|undefined),
* tileLoadFunction: ol.TileLoadFunctionType,
* tilePixelRatio: (number|undefined),
* tileUrlFunction: (ol.TileUrlFunctionType|undefined),
* url: (string|undefined),
* urls: (Array.<string>|undefined),
* wrapX: (boolean|undefined)}}
*/
ol.sourceUrlTileOptions;
/** /**
* @typedef {{x: number, y: number, width: number, height: number}} * @typedef {{x: number, y: number, width: number, height: number}}
*/ */
@@ -742,3 +691,37 @@ ol.style.RegularShapeRenderOptions;
* @api * @api
*/ */
ol.style.StyleFunction; ol.style.StyleFunction;
/**
* @typedef {{buf: ol.webgl.Buffer,
* buffer: WebGLBuffer}}
*/
ol.webglBufferCacheEntry;
/**
* @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}}
*/
ol.webglTextureCacheEntry;
/**
* When using {@link ol.xml.makeChildAppender} or
* {@link ol.xml.makeSimpleNodeFactory}, the top `objectStack` item needs to
* have this structure.
* @typedef {{node:Node}}
*/
ol.xmlNodeStackItem;
/**
* @typedef {function(Node, Array.<*>)}
*/
ol.xmlParser;
/**
* @typedef {function(Node, *, Array.<*>)}
*/
ol.xmlSerializer;
+1 -1
View File
@@ -35,7 +35,7 @@ ol.webgl.Context = function(canvas, gl) {
/** /**
* @private * @private
* @type {Object.<string, ol.WebglBufferCacheEntry>} * @type {Object.<string, ol.webglBufferCacheEntry>}
*/ */
this.bufferCache_ = {}; this.bufferCache_ = {};
+12 -12
View File
@@ -123,7 +123,7 @@ ol.xml.parse = function(xml) {
* @param {function(this: T, Node, Array.<*>): (Array.<*>|undefined)} * @param {function(this: T, Node, Array.<*>): (Array.<*>|undefined)}
* valueReader Value reader. * valueReader Value reader.
* @param {T=} opt_this The object to use as `this` in `valueReader`. * @param {T=} opt_this The object to use as `this` in `valueReader`.
* @return {ol.XmlParser} Parser. * @return {ol.xmlParser} Parser.
* @template T * @template T
*/ */
ol.xml.makeArrayExtender = function(valueReader, opt_this) { ol.xml.makeArrayExtender = function(valueReader, opt_this) {
@@ -152,7 +152,7 @@ ol.xml.makeArrayExtender = function(valueReader, opt_this) {
* object stack. * object stack.
* @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader.
* @param {T=} opt_this The object to use as `this` in `valueReader`. * @param {T=} opt_this The object to use as `this` in `valueReader`.
* @return {ol.XmlParser} Parser. * @return {ol.xmlParser} Parser.
* @template T * @template T
*/ */
ol.xml.makeArrayPusher = function(valueReader, opt_this) { ol.xml.makeArrayPusher = function(valueReader, opt_this) {
@@ -179,7 +179,7 @@ ol.xml.makeArrayPusher = function(valueReader, opt_this) {
* top of the stack. * top of the stack.
* @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader.
* @param {T=} opt_this The object to use as `this` in `valueReader`. * @param {T=} opt_this The object to use as `this` in `valueReader`.
* @return {ol.XmlParser} Parser. * @return {ol.xmlParser} Parser.
* @template T * @template T
*/ */
ol.xml.makeReplacer = function(valueReader, opt_this) { ol.xml.makeReplacer = function(valueReader, opt_this) {
@@ -204,7 +204,7 @@ ol.xml.makeReplacer = function(valueReader, opt_this) {
* @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader.
* @param {string=} opt_property Property. * @param {string=} opt_property Property.
* @param {T=} opt_this The object to use as `this` in `valueReader`. * @param {T=} opt_this The object to use as `this` in `valueReader`.
* @return {ol.XmlParser} Parser. * @return {ol.xmlParser} Parser.
* @template T * @template T
*/ */
ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) { ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) {
@@ -242,7 +242,7 @@ ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this)
* @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader.
* @param {string=} opt_property Property. * @param {string=} opt_property Property.
* @param {T=} opt_this The object to use as `this` in `valueReader`. * @param {T=} opt_this The object to use as `this` in `valueReader`.
* @return {ol.XmlParser} Parser. * @return {ol.xmlParser} Parser.
* @template T * @template T
*/ */
ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) { ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) {
@@ -272,11 +272,11 @@ ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this)
/** /**
* Create a serializer that appends nodes written by its `nodeWriter` to its * Create a serializer that appends nodes written by its `nodeWriter` to its
* designated parent. The parent is the `node` of the * designated parent. The parent is the `node` of the
* {@link ol.XmlNodeStackItem} at the top of the `objectStack`. * {@link ol.xmlNodeStackItem} at the top of the `objectStack`.
* @param {function(this: T, Node, V, Array.<*>)} * @param {function(this: T, Node, V, Array.<*>)}
* nodeWriter Node writer. * nodeWriter Node writer.
* @param {T=} opt_this The object to use as `this` in `nodeWriter`. * @param {T=} opt_this The object to use as `this` in `nodeWriter`.
* @return {ol.XmlSerializer} Serializer. * @return {ol.xmlSerializer} Serializer.
* @template T, V * @template T, V
*/ */
ol.xml.makeChildAppender = function(nodeWriter, opt_this) { ol.xml.makeChildAppender = function(nodeWriter, opt_this) {
@@ -305,7 +305,7 @@ ol.xml.makeChildAppender = function(nodeWriter, opt_this) {
* @param {function(this: T, Node, V, Array.<*>)} * @param {function(this: T, Node, V, Array.<*>)}
* nodeWriter Node writer. * nodeWriter Node writer.
* @param {T=} opt_this The object to use as `this` in `nodeWriter`. * @param {T=} opt_this The object to use as `this` in `nodeWriter`.
* @return {ol.XmlSerializer} Serializer. * @return {ol.xmlSerializer} Serializer.
* @template T, V * @template T, V
*/ */
ol.xml.makeArraySerializer = function(nodeWriter, opt_this) { ol.xml.makeArraySerializer = function(nodeWriter, opt_this) {
@@ -422,7 +422,7 @@ ol.xml.makeStructureNS = function(namespaceURIs, structure, opt_structureNS) {
/** /**
* Parse a node using the parsers and object stack. * Parse a node using the parsers and object stack.
* @param {Object.<string, Object.<string, ol.XmlParser>>} parsersNS * @param {Object.<string, Object.<string, ol.xmlParser>>} parsersNS
* Parsers by namespace. * Parsers by namespace.
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
@@ -445,7 +445,7 @@ ol.xml.parseNode = function(parsersNS, node, objectStack, opt_this) {
/** /**
* Push an object on top of the stack, parse and return the popped object. * Push an object on top of the stack, parse and return the popped object.
* @param {T} object Object. * @param {T} object Object.
* @param {Object.<string, Object.<string, ol.XmlParser>>} parsersNS * @param {Object.<string, Object.<string, ol.xmlParser>>} parsersNS
* Parsers by namespace. * Parsers by namespace.
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
@@ -463,7 +463,7 @@ ol.xml.pushParseAndPop = function(
/** /**
* Walk through an array of `values` and call a serializer for each value. * Walk through an array of `values` and call a serializer for each value.
* @param {Object.<string, Object.<string, ol.XmlSerializer>>} serializersNS * @param {Object.<string, Object.<string, ol.xmlSerializer>>} serializersNS
* Namespaced serializers. * Namespaced serializers.
* @param {function(this: T, *, Array.<*>, (string|undefined)): (Node|undefined)} nodeFactory * @param {function(this: T, *, Array.<*>, (string|undefined)): (Node|undefined)} nodeFactory
* Node factory. The `nodeFactory` creates the node whose namespace and name * Node factory. The `nodeFactory` creates the node whose namespace and name
@@ -503,7 +503,7 @@ ol.xml.serialize = function(
/** /**
* @param {O} object Object. * @param {O} object Object.
* @param {Object.<string, Object.<string, ol.XmlSerializer>>} serializersNS * @param {Object.<string, Object.<string, ol.xmlSerializer>>} serializersNS
* Namespaced serializers. * Namespaced serializers.
* @param {function(this: T, *, Array.<*>, (string|undefined)): (Node|undefined)} nodeFactory * @param {function(this: T, *, Array.<*>, (string|undefined)): (Node|undefined)} nodeFactory
* Node factory. The `nodeFactory` creates the node whose namespace and name * Node factory. The `nodeFactory` creates the node whose namespace and name
-41
View File
@@ -12,47 +12,6 @@ describe('ol.source.Tile', function() {
}); });
}); });
describe('#setKey()', function() {
it('sets the source key', function() {
var source = new ol.source.Tile({});
expect(source.getKey()).to.equal('');
var key = 'foo';
source.setKey(key);
expect(source.getKey()).to.equal(key);
});
});
describe('#setKey()', function() {
it('dispatches a change event', function(done) {
var source = new ol.source.Tile({});
var key = 'foo';
source.once('change', function() {
done();
});
source.setKey(key);
});
it('does not dispatch change if key does not change', function(done) {
var source = new ol.source.Tile({});
var key = 'foo';
source.once('change', function() {
source.once('change', function() {
done(new Error('Unexpected change event after source.setKey()'));
});
setTimeout(function() {
done();
}, 10);
source.setKey(key); // this should not result in a change event
});
source.setKey(key); // this should result in a change event
});
});
describe('#forEachLoadedTile()', function() { describe('#forEachLoadedTile()', function() {
var callback; var callback;
-48
View File
@@ -3,54 +3,6 @@ goog.provide('ol.test.source.UrlTile');
describe('ol.source.UrlTile', function() { describe('ol.source.UrlTile', function() {
describe('#setUrl()', function() {
it('sets the URL for the source', function() {
var source = new ol.source.UrlTile({});
var url = 'https://example.com/';
source.setUrl(url);
expect(source.getUrls()).to.eql([url]);
});
it('updates the key for the source', function() {
var source = new ol.source.UrlTile({});
var url = 'https://example.com/';
source.setUrl(url);
expect(source.getKey()).to.eql(url);
});
});
describe('#setUrls()', function() {
it('sets the URL for the source', function() {
var source = new ol.source.UrlTile({});
var urls = [
'https://a.example.com/',
'https://b.example.com/',
'https://c.example.com/'
];
source.setUrls(urls);
expect(source.getUrls()).to.eql(urls);
});
it('updates the key for the source', function() {
var source = new ol.source.UrlTile({});
var urls = [
'https://a.example.com/',
'https://b.example.com/',
'https://c.example.com/'
];
source.setUrls(urls);
expect(source.getKey()).to.eql(urls.join('\n'));
});
});
describe('url option', function() { describe('url option', function() {
it('expands url template', function() { it('expands url template', function() {
var tileSource = new ol.source.UrlTile({ var tileSource = new ol.source.UrlTile({