Commit Graph
100 Commits
Author SHA1 Message Date
Bart van den Eijnden 17356bc3ee Merge pull request #1063 from oterral/parsing_stylemap
Parsing styleMap (r=@bartvde)
2013-10-03 08:01:56 -07:00
Bart van den Eijnden 26b46d248b Merge pull request #1022 from bartvde/parser-api
Parser api changes (remove read/write for feature parsers and add parser to the filenames) (r=@elemoine)
2013-09-13 08:01:57 -07:00
Bart van den Eijnden d8ae3c161c rename parser files to have parser as part of their filename, so they follow the ol3 conventions 2013-09-13 11:05:00 +02:00
Bart van den Eijnden 99f2d0e3d5 do not export read and write for feature parsers 2013-09-13 10:35:57 +02:00
Bart van den Eijnden c3a920774b Merge pull request #852 from bartvde/ogcfilter2
Add parser for OGC Filter 1.0 and 1.1 (read/write) (r=@tschaub,@ahocevar)
2013-08-15 02:12:58 -07:00
Bart van den Eijnden ab7d446e25 Merge pull request #3 from tschaub/bartvde-ogcfilter2
Suggestions for filter encoding
2013-08-15 02:12:03 -07:00
Bart van den Eijnden 09c27f430d remove accidentally committed swap file 2013-08-09 15:58:31 +02:00
Bart van den Eijnden 8792973c08 make sure the _expression reader can deal with combined propertyname and literals 2013-08-09 15:57:29 +02:00
Bart van den Eijnden 29954d2ff9 trim the string before passing it off to ol.expr.parse 2013-08-09 11:08:19 +02:00
Bart van den Eijnden deb88a5a6d change _expression reader 2013-08-09 10:42:16 +02:00
Bart van den Eijnden 1948233d1f merge with master - solving conflicts 2013-08-09 09:55:44 +02:00
Bart van den Eijnden b66f4aef07 make Travis happy 2013-08-04 15:10:10 +02:00
Bart van den Eijnden 8d997f17ec forgot to remove a commented code block 2013-08-04 15:10:10 +02:00
Bart van den Eijnden 17fefda8fd implement GMLReadOptions and GMLWriteOptions as discussed with @ahocevar 2013-08-04 15:10:10 +02:00
Bart van den Eijnden 2f4f508d1a move srsName and axisOrientation from the instance to the read and write functions as discussed with @ahocevar 2013-08-04 15:10:10 +02:00
Bart van den Eijnden a4ceb41938 fix up KML tests 2013-08-04 15:10:09 +02:00
Bart van den Eijnden 33dd188f9b fix up the geojson tests 2013-08-04 15:10:08 +02:00
Bart van den Eijnden 7b31ec26ea fix up build 2013-08-04 15:10:08 +02:00
Bart van den Eijnden 369d692a90 implement @tschaub's suggestions for ieq and ineq 2013-07-22 14:11:29 +02:00
Bart van den Eijnden 875edc540e implement @tschaub's suggestions for the LIKE function 2013-07-22 13:23:08 +02:00
Bart van den Eijnden 31fd41ab14 make filterMap_ static as proposed by @tschaub 2013-07-09 13:34:23 +02:00
Bart van den Eijnden c299bfa1cb more dot notation 2013-07-08 17:29:32 +02:00
Bart van den Eijnden 499319fb99 address most of @tschaub's review comments, use dot notation where possible still needs to be done, and I have some questions on the _expression reader still 2013-07-08 17:04:27 +02:00
Bart van den Eijnden ab40ab6208 Add parser for OGC Filter 1.0 and 1.1 (read/write)
This work is based on the ol.expr package by @tschaub.
It adds a few named expression functions to that package:

 * INTERSECTS, CONTAINS, DWITHIN, WITHIN (no client-side implementation as yet)
 * LIKE (like comparison with wildcard, singleChar and escapeChar)
 * IEQ (case-insensitive equality)
 * INEQ (case-insensitive non-equality)

It also adds a few extra parameters to the existing EXTENT function to be able
to deserialize and serialize all info (i.e. projection and property name).

Some changes were needed for the GML parser as well:

 * createGeometry function needed to be public
 * when parsing Box (GML2) and Envelope (GML3) also parse the srsName
 * fix up writing for Box and Envelope now that bounds is an array

Also added createDocumentFragment function to the XML parser. Implementation
is similar to OpenLayers 2.

Some addtional notes on the implementation:

 * PropertyIsBetween was implemented as an ol.expr.Logical with operator
   ol.expr.LogicalOp.AND and two ol.expr.Comparison instances with operator
   ol.expr.ComparisonOp.GTE and ol.expr.ComparisonOp.LTE
 * In OGC Filter And and Or can contain more than 2 sub filters, so this
   is translated into a hierarchy of ol.expr.Logical
2013-07-03 13:09:25 +02:00
Bart van den Eijnden d552d27a35 Merge pull request #783 from bartvde/apidoc2
Add more content for the API doc (r=@twpayne,@tschaub,@fredj)
2013-06-12 11:05:07 -07:00
Bart van den Eijnden 0237675711 address review comments 2013-06-12 20:03:57 +02:00
Bart van den Eijnden 8dc97790bc Add more content for the API doc
Involves additions to (there will be subsequent pull requests for other
classes):
- ol.Attribution
- ol.Collection
- ol.Expression
- ol.Feature
- ol.Geolocation
- ol.Map
- ol.Object
- ol.Overlay
- ol.Projection
- ol.View2D
- ol.control.Attribution
- ol.control.Control
- ol.control.FullScreen
- ol.control.Logo
- ol.control.MousePosition
- ol.control.ScaleLine
- ol.control.Zoom
- ol.control.ZoomSlider
- ol.dom.Input
- ol.filter.Filter
- ol.filter.Geometry
- ol.filter.Logical
2013-06-11 20:56:04 +02:00
Bart van den Eijnden 317281b37b Merge pull request #729 from bartvde/wktsingleton
static read and write methods on ol.parser.WKT (r=@ahocevar)
2013-05-30 00:29:53 -07:00
Bart van den Eijnden 9968a5feda Merge pull request #734 from bartvde/xml-ie9
Fix XML serialize and xml_eql in IE9 (r=@ahocevar)
2013-05-27 02:28:48 -07:00
Bart van den Eijnden 0f3c151058 implement review comment by @ahocevar 2013-05-27 11:04:27 +02:00
Bart van den Eijnden b921bece0e Merge pull request #725 from bartvde/gpx
Implement GPX parser (read/write). (r=@fredj)
2013-05-27 01:42:09 -07:00
Bart van den Eijnden 81bffb464f Merge pull request #737 from bartvde/feature-id
FeatureId support in GML (r/w) and KML (w) (r=@fredj)
2013-05-27 01:39:59 -07:00
Bart van den Eijnden 3ee533a9b0 FeatureId support in GML (r/w) and KML (w)
Now that we have FeatureId support (see #733), we can add this back to the
GML parsers (v2 and v3). Also add write support for FeatureId in KML, read
support was already added by @fredj
2013-05-24 17:00:59 +02:00
Bart van den Eijnden e63423eafe Merge pull request #736 from bartvde/jsdoc2
Add parser.jsdoc file for docs on parser options (p=@ahocevar, r=@bartvde)
2013-05-24 07:02:06 -07:00
Bart van den Eijnden 392d529168 Add parser.jsdoc file for docs on parser options.
Pointer by @ahocevar in #735
2013-05-24 16:00:17 +02:00
Bart van den Eijnden 9881411090 fix typo in WMTS parser 2013-05-24 14:02:00 +02:00
Bart van den Eijnden 6e80a35960 Static read and write functions on WKT parser
Use a singleton to implement static read and write methods on ol.parser.WKT.
2013-05-24 11:17:21 +02:00
Bart van den Eijnden d8232bb484 Fix XML serialize and xml_eql in IE9
Use the xml property instead in IE for serializing XML.
The xml_eql tests were failing in IE9 on a difference between null and an
empty string for namespaceURI of attributes, this difference is not
relevant to our testing so make sure we ignore.
2013-05-24 10:53:29 +02:00
Bart van den Eijnden f8ef902af4 Merge pull request #732 from bartvde/geojson-write
Write support for ol.parser.GeoJSON (r=@tschaub)
2013-05-24 00:38:10 -07:00
Bart van den Eijnden 4b0c43fb8b Merge pull request #726 from bartvde/kml_serialize
Small fixes for KML write (r=@ahocevar)
2013-05-23 07:36:33 -07:00
Bart van den Eijnden 93b067b6bc Write support for ol.parser.GeoJSON
Also add some convenience with static read and write methods based on the
singleton.
2013-05-23 15:57:11 +02:00
Bart van den Eijnden 0f0ea7e63f make feature info work on touch devices for gpx example see #727 2013-05-22 13:06:56 +02:00
Bart van den Eijnden 969b47c78c address review by @fredj 2013-05-22 13:01:41 +02:00
Bart van den Eijnden 3a83f1b861 Small fixes for KML write.
Be a good XML citizen and always write out schemaLocation.
Use serialize on ol.parser.XML so that we don't have to set xmlns manually.
2013-05-22 12:00:58 +02:00
Bart van den Eijnden dc922b4ffa Implement GPX parser (read/write).
Implement a parser for GPX which supports read and write.
2013-05-22 10:44:36 +02:00
Bart van den Eijnden b3ad00da13 Merge pull request #714 from bartvde/gmloptions
GML options not always applied (=r@ahocevar)
2013-05-17 03:51:06 -07:00
Bart van den Eijnden 0aa4fe258e GML options not always applied.
This is a follow-up for https://github.com/openlayers/ol3/pull/711
for the GML parser. Also use goog.array.map instead of map as was
pointed out by @twpayne on the WKT review and update the example data
to use all US states as pointed out by @tschaub on the Google hangout.
2013-05-17 11:48:05 +02:00
Bart van den Eijnden 921aa28b42 Merge pull request #712 from bartvde/wkt
Add WKT parser (r=@ahocevar,@twpayne,@tschaub)
2013-05-17 01:55:42 -07:00
Bart van den Eijnden 3e3b5ab02d move last RegExp into constant 2013-05-17 10:15:22 +02:00
Bart van den Eijnden 585887b04e address review comments by @twpayne 2013-05-17 10:09:40 +02:00
Bart van den Eijnden bb16820ab0 add exports for WKT 2013-05-16 15:44:31 +02:00
Bart van den Eijnden bf8c12d9f7 Add WKT parser.
Add a parser (read/write) for OGC Well-Known-Text (WKT). It deals with
geometries only, not with features, mostly because WKT can only contain a
single geometry (or geometry collection). This can later on be used to
serialize and deserialize geometries in ol3.
2013-05-16 15:29:39 +02:00
Bart van den Eijnden 32ea32521d Merge pull request #709 from bartvde/gmlfresh
GML parser (r=@ahocevar)
2013-05-15 07:08:24 -07:00
Bart van den Eijnden e8ed1674ea do not specify the source projection in ol.parser.ReadFeaturesOptions anymore 2013-05-15 15:34:11 +02:00
Bart van den Eijnden 2ad3ee6f99 incorporate review from @ahocevar 2013-05-15 14:50:37 +02:00
Bart van den Eijnden 5ad4734c24 GML parser.
This adds a parser (read/write) for GML v2 and v3. GML v3 is limited to the
simple features profile of GML 3.1.1, just like OpenLayers 2 was. This will
be the basis for the WFS parser, but it only makes sense to continue this work
once feature modification (insert, update, delete) is in place in ol3. So the
WFS parser will be another pull request.
2013-05-14 20:12:05 +02:00
Bart van den Eijnden 87b3a3274d Merge pull request #699 from bartvde/kmlxmleql3
Use xmleql in the KML tests (r=@ahocevar)
2013-05-10 03:14:35 -07:00
Bart van den Eijnden c69e5c1dba Use xmleql in the KML tests
This also involves some modifications to the xmleql functionality now that
it was tested with a real-life case (KML). Also, some of the input KML files
needed to be changed since we currently cannot roundtrip 100% of the input.
2013-05-08 16:41:45 +02:00
Bart van den Eijnden 14e073fb5a Merge pull request #689 from bartvde/xmleql4
Improvements for xmleql (r=@ahocevar)
2013-05-07 08:06:57 -07:00
Bart van den Eijnden 3fc0f2b47d Improvements for xmleql
This adds some improvements for the xmleql test assertion. When passed in a
document, use the documentElement. Also improve error reporting as suggested
by @tschaub.
2013-05-06 15:35:40 +02:00
Bart van den Eijnden 10b690b5f9 Merge pull request #661 from bartvde/xmleql
Add Assertion.prototype.xmleql (r=@twpayne,@tschaub,@elemoine)
2013-05-06 02:43:24 -07:00
Bart van den Eijnden 865404a0d3 Add Assertion.prototype.xmleql
This is based on the xml_eq function we had in the OL2 test framework but
adapted to expect.js.
2013-05-06 11:18:49 +02:00
Bart van den Eijnden 334b2276cf Merge pull request #641 from bartvde/kmlexample
Add AsyncStringFeatureParser and use plain (r=@ahocevar)
2013-04-22 23:35:21 -07:00
Bart van den Eijnden feb6c4c2d7 Add AsyncStringFeatureParser and use plain
XMLHttpRequest in the KML example

Since the content-type on github.io is application/octet-stream we need
to implement an Async string based parser interface in the KML parser.
Also use plain XmlHttpRequest in the example instead of jQuery Ajax since
the vector-features example also uses that.
2013-04-22 16:45:33 +02:00
Bart van den Eijnden aa69b4bae8 Merge pull request #539 from bartvde/wmscapstests
Use afterLoadXml in WMSCapabilities parser tests (r=@twpayne)
2013-04-12 04:03:14 -07:00
Bart van den Eijnden 8fafe63553 Use afterLoadXml in WMSCapabilities parser tests
The WMS Capabilities parser tests were created before the afterLoadXml
utility functions were created. This is now corrected.
2013-04-12 11:25:08 +02:00
Bart van den Eijnden d1d18ad325 Merge pull request #517 from bartvde/kmlfresh3
Add a parser for reading and writing KML (r=@tschaub,@fredj,@twpayne)
2013-04-11 23:50:44 -07:00
Bart van den Eijnden 8cc70f35d9 use goog.global, restructure to have ol.parser.KML instead of ol.parser.ogc.KML 2013-04-10 10:17:28 +02:00
Bart van den Eijnden 577ebd6abe move examples/kml to examples/data/kml 2013-04-09 16:17:36 +02:00
Bart van den Eijnden ed9861317f Add a parser for reading and writing KML.
This adds ol.parser.ogc.KML which can be used to read and write KML documents.
NetworkLinks are retrieved asynchronously.
Current caveats of the implementation are:

* LabelStyle not yet implemented. Missing support in renderers.
* When using shared structures the parser needs to be configured with
  dimension 2.
* We need a better way to disable fill, currently we use opacity as a
  workaround.
* We cannot really roundtrip documents, since some of the info is not
  preserved in the ol structures. But we can write out most of the important
  info.
2013-04-09 15:34:03 +02:00
Bart van den Eijnden 1f510d893f Merge pull request #282 from bartvde/wms1_0_0
add WMS GetCapabilities 1.0.0 parser (=r@elemoine)
2013-03-07 05:06:13 -08:00
Bart van den Eijnden d56f2bc7aa make Travis happy by adding comment to the constant in the test 2013-03-07 13:57:51 +01:00
Bart van den Eijnden 0dab671072 add WMS 1.0.0 parsing to false by default 2013-03-07 13:53:26 +01:00
Bart van den Eijnden aa4c4ddc48 Merge branch 'master' of github.com:openlayers/ol3 into vector 2013-03-05 14:20:32 +01:00
Bart van den Eijnden dfcdf75449 add WMS 1.0.0 parser 2013-03-05 13:26:04 +01:00
Bart van den Eijnden d587d45a09 Merge pull request #271 from bartvde/epsg4326example
remove unused code from epsg-4326 example
2013-03-05 01:00:00 -08:00
Bart van den Eijnden 68c1651cc5 remove unused code from epsg-4326 example 2013-03-05 09:54:35 +01:00
Bart van den Eijnden efefb2554a Merge pull request #204 from bartvde/wmscapsfixes
fixes for the WMS capabilities parser (r=@elemoine)
2013-02-20 00:48:30 -08:00
Bart van den Eijnden 793a956211 Several fixes to the WMS Capabilities parser
Make sure the object structure returned is not mangled by Closure

Do not use closure XHR or JSON in the example

Use Jasmine's async support in the test cases

Get rid of some backwards compatibility now that we have a fresh start
2013-02-19 17:12:02 +01:00
Bart van den Eijnden a2bcf51272 Merge pull request #213 from bartvde/wmtsclean
Implement WMTS GetCapabilities parser.
2013-02-19 07:45:08 -08:00
Bart van den Eijnden 5e29830462 Add WMTS GetCapabilities parser
Implements WMTS GetCapabilities parser, which depends partly on
an OWSCommon parser.

Integration with the layer source will be done at a later stage.
2013-02-19 16:32:56 +01:00
Bart van den Eijnden 234f6bc411 Merge pull request #180 from bartvde/wmscapsclean
add WMS GetCapabilities parser for WMS 1.1.0, 1.1.1, 1.1.1 WMS-C profile
2013-02-14 05:02:39 -08:00
Bart van den Eijnden 13d95b90a3 use namespace URI instead of prefix as suggested by @tschaub and discussed with @ahocevar 2013-02-13 20:58:48 +01:00
Bart van den Eijnden f16664cb87 add an example 2013-02-07 10:45:35 +01:00
Bart van den Eijnden 6484760507 make Travis build pass again 2013-02-06 14:35:43 +01:00
Bart van den Eijnden 360c426f14 add WMS GetCapabilities parser for WMS 1.1.0, 1.1.1, 1.1.1 WMS-C profile and WMS 1.3.0 2013-02-06 14:25:57 +01:00
Bart van den Eijnden c51b2b3fef add info about install Jasmine and the precommit hook from build.py 2013-01-28 15:18:15 +01:00
Bart van den Eijnden 62f3f70910 Merge pull request #523 from jachym/master
Modifications for OpenLayers.Format.WPS* (p=@jachym,r=@bartvde)
2012-06-18 06:35:49 -07:00
Bart van den Eijnden a7c202231f Merge branch '2.12' of github.com:openlayers/openlayers 2012-06-13 07:18:53 +02:00
Bart van den Eijnden adcf5bb20a Merge pull request #468 from bartvde/bboxstrategy
Fix visibility and inRange issues with the BBOX strategy (r=@elemoine)
2012-05-15 08:13:55 -07:00
Bart van den Eijnden 44f9b81085 also check for visibility of the layer in the central place: the update function 2012-05-15 12:26:21 +02:00
Bart van den Eijnden bca3e45940 BBOX strategy should not request data if its layer is out of range when changing layer visibility 2012-05-15 12:18:42 +02:00
Bart van den Eijnden ce18994664 Merge pull request #413 from bartvde/extendeddate
allow the regex for date parsing to be specified, so that applications can potentially deal with dates before BC in ISO-8601 (r=@ahocevar)
2012-04-17 08:41:11 -07:00
Bart van den Eijnden a96d32d284 rename to dateRegEx and provide default value in api docs 2012-04-17 17:39:37 +02:00
Bart van den Eijnden f07660e8c5 implement @ahocevar's suggestion instead 2012-04-17 15:57:51 +02:00
Bart van den Eijnden 90a8ac9c71 allow for negative years in dates 2012-04-17 14:23:56 +02:00
Bart van den Eijnden 344e2124c9 Merge pull request #400 from bartvde/bing
fix Bing attribution issue caused by reverse axis order (r=@elemoine). Thanks Eric Blasenheim for the detailed report.
2012-04-10 06:02:30 -07:00
Bart van den Eijnden 59cc18d85b fix Bing attribution issue reported by PitneyBowes 2012-04-10 14:31:20 +02:00
Bart van den Eijnden a00b565fcc Merge pull request #372 from bartvde/graphictext
setting graphic to false by default when reading a TextSymbolizer (r=@ahocevar)
2012-03-30 17:00:27 -07:00
Bart van den Eijnden 4b22a1e2d2 move logic into GeoServer profile as suggested by @ahocevar 2012-03-31 01:26:37 +02:00