From 99f2d0e3d5ecc1afc907133f521dee88bf0a732d Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Fri, 13 Sep 2013 10:35:57 +0200 Subject: [PATCH 1/2] do not export read and write for feature parsers --- src/ol/parser/geojson.exports | 5 ----- src/ol/parser/gpx.exports | 2 -- src/ol/parser/kml.exports | 2 -- src/ol/parser/topojson.exports | 3 --- 4 files changed, 12 deletions(-) diff --git a/src/ol/parser/geojson.exports b/src/ol/parser/geojson.exports index 7143cfbf11..0573b46441 100644 --- a/src/ol/parser/geojson.exports +++ b/src/ol/parser/geojson.exports @@ -1,6 +1 @@ @exportSymbol ol.parser.GeoJSON - -@exportProperty ol.parser.GeoJSON.prototype.read -@exportProperty ol.parser.GeoJSON.read -@exportProperty ol.parser.GeoJSON.prototype.write -@exportProperty ol.parser.GeoJSON.write diff --git a/src/ol/parser/gpx.exports b/src/ol/parser/gpx.exports index 57d874bb80..3cb2cef914 100644 --- a/src/ol/parser/gpx.exports +++ b/src/ol/parser/gpx.exports @@ -1,3 +1 @@ @exportSymbol ol.parser.GPX -@exportProperty ol.parser.GPX.prototype.read -@exportProperty ol.parser.GPX.prototype.write diff --git a/src/ol/parser/kml.exports b/src/ol/parser/kml.exports index d389b1ad42..d625f017ba 100644 --- a/src/ol/parser/kml.exports +++ b/src/ol/parser/kml.exports @@ -1,3 +1 @@ @exportSymbol ol.parser.KML -@exportProperty ol.parser.KML.prototype.read -@exportProperty ol.parser.KML.prototype.write diff --git a/src/ol/parser/topojson.exports b/src/ol/parser/topojson.exports index 68b86dff97..eb09e6f28c 100644 --- a/src/ol/parser/topojson.exports +++ b/src/ol/parser/topojson.exports @@ -1,4 +1 @@ @exportSymbol ol.parser.TopoJSON - -@exportProperty ol.parser.TopoJSON.prototype.read -@exportProperty ol.parser.TopoJSON.read From d8ae3c161cc4a23030bef4039e41b272af2b5b9b Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Fri, 13 Sep 2013 11:05:00 +0200 Subject: [PATCH 2/2] rename parser files to have parser as part of their filename, so they follow the ol3 conventions --- src/ol/parser/{geojson.exports => geojsonparser.exports} | 0 src/ol/parser/{geojson.js => geojsonparser.js} | 0 src/ol/parser/{gpx.exports => gpxparser.exports} | 0 src/ol/parser/{gpx.js => gpxparser.js} | 0 src/ol/parser/{kml.exports => kmlparser.exports} | 0 src/ol/parser/{kml.js => kmlparser.js} | 0 .../parser/ogc/{exceptionreport.js => exceptionreportparser.js} | 0 src/ol/parser/ogc/{filter.js => filterparser.js} | 0 src/ol/parser/ogc/{filter_v1.js => filterparser_v1.js} | 0 src/ol/parser/ogc/{filter_v1_0_0.js => filterparser_v1_0_0.js} | 0 src/ol/parser/ogc/{filter_v1_1_0.js => filterparser_v1_1_0.js} | 0 src/ol/parser/ogc/{gml.exports => gmlparser.exports} | 0 src/ol/parser/ogc/{gml.js => gmlparser.js} | 0 src/ol/parser/ogc/{gml_v2.js => gmlparser_v2.js} | 0 src/ol/parser/ogc/{gml_v3.js => gmlparser_v3.js} | 0 src/ol/parser/ogc/{owscommon_v1.js => owscommonparser_v1.js} | 0 .../parser/ogc/{owscommon_v1_1_0.js => owscommonparser_v1_1_0.js} | 0 src/ol/parser/ogc/{versioned.js => versionedparser.js} | 0 .../{wmscapabilities.exports => wmscapabilitiesparser.exports} | 0 .../parser/ogc/{wmscapabilities.js => wmscapabilitiesparser.js} | 0 .../ogc/{wmscapabilities_v1.js => wmscapabilitiesparser_v1.js} | 0 ...{wmscapabilities_v1_0_0.js => wmscapabilitiesparser_v1_0_0.js} | 0 .../{wmscapabilities_v1_1.js => wmscapabilitiesparser_v1_1.js} | 0 ...{wmscapabilities_v1_1_0.js => wmscapabilitiesparser_v1_1_0.js} | 0 ...{wmscapabilities_v1_1_1.js => wmscapabilitiesparser_v1_1_1.js} | 0 ...lities_v1_1_1_WMSC.js => wmscapabilitiesparser_v1_1_1_WMSC.js} | 0 ...{wmscapabilities_v1_3_0.js => wmscapabilitiesparser_v1_3_0.js} | 0 .../{wmtscapabilities.exports => wmtscapabilitiesparser.exports} | 0 .../parser/ogc/{wmtscapabilities.js => wmtscapabilitiesparser.js} | 0 ...mtscapabilities_v1_0_0.js => wmtscapabilitiesparser_v1_0_0.js} | 0 src/ol/parser/{polyline.js => polylineparser.js} | 0 src/ol/parser/{topojson.exports => topojsonparser.exports} | 0 src/ol/parser/{topojson.js => topojsonparser.js} | 0 src/ol/parser/{wkt.exports => wktparser.exports} | 0 src/ol/parser/{wkt.js => wktparser.js} | 0 src/ol/parser/{xml.js => xmlparser.js} | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/parser/{geojson.exports => geojsonparser.exports} (100%) rename src/ol/parser/{geojson.js => geojsonparser.js} (100%) rename src/ol/parser/{gpx.exports => gpxparser.exports} (100%) rename src/ol/parser/{gpx.js => gpxparser.js} (100%) rename src/ol/parser/{kml.exports => kmlparser.exports} (100%) rename src/ol/parser/{kml.js => kmlparser.js} (100%) rename src/ol/parser/ogc/{exceptionreport.js => exceptionreportparser.js} (100%) rename src/ol/parser/ogc/{filter.js => filterparser.js} (100%) rename src/ol/parser/ogc/{filter_v1.js => filterparser_v1.js} (100%) rename src/ol/parser/ogc/{filter_v1_0_0.js => filterparser_v1_0_0.js} (100%) rename src/ol/parser/ogc/{filter_v1_1_0.js => filterparser_v1_1_0.js} (100%) rename src/ol/parser/ogc/{gml.exports => gmlparser.exports} (100%) rename src/ol/parser/ogc/{gml.js => gmlparser.js} (100%) rename src/ol/parser/ogc/{gml_v2.js => gmlparser_v2.js} (100%) rename src/ol/parser/ogc/{gml_v3.js => gmlparser_v3.js} (100%) rename src/ol/parser/ogc/{owscommon_v1.js => owscommonparser_v1.js} (100%) rename src/ol/parser/ogc/{owscommon_v1_1_0.js => owscommonparser_v1_1_0.js} (100%) rename src/ol/parser/ogc/{versioned.js => versionedparser.js} (100%) rename src/ol/parser/ogc/{wmscapabilities.exports => wmscapabilitiesparser.exports} (100%) rename src/ol/parser/ogc/{wmscapabilities.js => wmscapabilitiesparser.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1.js => wmscapabilitiesparser_v1.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1_0_0.js => wmscapabilitiesparser_v1_0_0.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1_1.js => wmscapabilitiesparser_v1_1.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1_1_0.js => wmscapabilitiesparser_v1_1_0.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1_1_1.js => wmscapabilitiesparser_v1_1_1.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1_1_1_WMSC.js => wmscapabilitiesparser_v1_1_1_WMSC.js} (100%) rename src/ol/parser/ogc/{wmscapabilities_v1_3_0.js => wmscapabilitiesparser_v1_3_0.js} (100%) rename src/ol/parser/ogc/{wmtscapabilities.exports => wmtscapabilitiesparser.exports} (100%) rename src/ol/parser/ogc/{wmtscapabilities.js => wmtscapabilitiesparser.js} (100%) rename src/ol/parser/ogc/{wmtscapabilities_v1_0_0.js => wmtscapabilitiesparser_v1_0_0.js} (100%) rename src/ol/parser/{polyline.js => polylineparser.js} (100%) rename src/ol/parser/{topojson.exports => topojsonparser.exports} (100%) rename src/ol/parser/{topojson.js => topojsonparser.js} (100%) rename src/ol/parser/{wkt.exports => wktparser.exports} (100%) rename src/ol/parser/{wkt.js => wktparser.js} (100%) rename src/ol/parser/{xml.js => xmlparser.js} (100%) diff --git a/src/ol/parser/geojson.exports b/src/ol/parser/geojsonparser.exports similarity index 100% rename from src/ol/parser/geojson.exports rename to src/ol/parser/geojsonparser.exports diff --git a/src/ol/parser/geojson.js b/src/ol/parser/geojsonparser.js similarity index 100% rename from src/ol/parser/geojson.js rename to src/ol/parser/geojsonparser.js diff --git a/src/ol/parser/gpx.exports b/src/ol/parser/gpxparser.exports similarity index 100% rename from src/ol/parser/gpx.exports rename to src/ol/parser/gpxparser.exports diff --git a/src/ol/parser/gpx.js b/src/ol/parser/gpxparser.js similarity index 100% rename from src/ol/parser/gpx.js rename to src/ol/parser/gpxparser.js diff --git a/src/ol/parser/kml.exports b/src/ol/parser/kmlparser.exports similarity index 100% rename from src/ol/parser/kml.exports rename to src/ol/parser/kmlparser.exports diff --git a/src/ol/parser/kml.js b/src/ol/parser/kmlparser.js similarity index 100% rename from src/ol/parser/kml.js rename to src/ol/parser/kmlparser.js diff --git a/src/ol/parser/ogc/exceptionreport.js b/src/ol/parser/ogc/exceptionreportparser.js similarity index 100% rename from src/ol/parser/ogc/exceptionreport.js rename to src/ol/parser/ogc/exceptionreportparser.js diff --git a/src/ol/parser/ogc/filter.js b/src/ol/parser/ogc/filterparser.js similarity index 100% rename from src/ol/parser/ogc/filter.js rename to src/ol/parser/ogc/filterparser.js diff --git a/src/ol/parser/ogc/filter_v1.js b/src/ol/parser/ogc/filterparser_v1.js similarity index 100% rename from src/ol/parser/ogc/filter_v1.js rename to src/ol/parser/ogc/filterparser_v1.js diff --git a/src/ol/parser/ogc/filter_v1_0_0.js b/src/ol/parser/ogc/filterparser_v1_0_0.js similarity index 100% rename from src/ol/parser/ogc/filter_v1_0_0.js rename to src/ol/parser/ogc/filterparser_v1_0_0.js diff --git a/src/ol/parser/ogc/filter_v1_1_0.js b/src/ol/parser/ogc/filterparser_v1_1_0.js similarity index 100% rename from src/ol/parser/ogc/filter_v1_1_0.js rename to src/ol/parser/ogc/filterparser_v1_1_0.js diff --git a/src/ol/parser/ogc/gml.exports b/src/ol/parser/ogc/gmlparser.exports similarity index 100% rename from src/ol/parser/ogc/gml.exports rename to src/ol/parser/ogc/gmlparser.exports diff --git a/src/ol/parser/ogc/gml.js b/src/ol/parser/ogc/gmlparser.js similarity index 100% rename from src/ol/parser/ogc/gml.js rename to src/ol/parser/ogc/gmlparser.js diff --git a/src/ol/parser/ogc/gml_v2.js b/src/ol/parser/ogc/gmlparser_v2.js similarity index 100% rename from src/ol/parser/ogc/gml_v2.js rename to src/ol/parser/ogc/gmlparser_v2.js diff --git a/src/ol/parser/ogc/gml_v3.js b/src/ol/parser/ogc/gmlparser_v3.js similarity index 100% rename from src/ol/parser/ogc/gml_v3.js rename to src/ol/parser/ogc/gmlparser_v3.js diff --git a/src/ol/parser/ogc/owscommon_v1.js b/src/ol/parser/ogc/owscommonparser_v1.js similarity index 100% rename from src/ol/parser/ogc/owscommon_v1.js rename to src/ol/parser/ogc/owscommonparser_v1.js diff --git a/src/ol/parser/ogc/owscommon_v1_1_0.js b/src/ol/parser/ogc/owscommonparser_v1_1_0.js similarity index 100% rename from src/ol/parser/ogc/owscommon_v1_1_0.js rename to src/ol/parser/ogc/owscommonparser_v1_1_0.js diff --git a/src/ol/parser/ogc/versioned.js b/src/ol/parser/ogc/versionedparser.js similarity index 100% rename from src/ol/parser/ogc/versioned.js rename to src/ol/parser/ogc/versionedparser.js diff --git a/src/ol/parser/ogc/wmscapabilities.exports b/src/ol/parser/ogc/wmscapabilitiesparser.exports similarity index 100% rename from src/ol/parser/ogc/wmscapabilities.exports rename to src/ol/parser/ogc/wmscapabilitiesparser.exports diff --git a/src/ol/parser/ogc/wmscapabilities.js b/src/ol/parser/ogc/wmscapabilitiesparser.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities.js rename to src/ol/parser/ogc/wmscapabilitiesparser.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1_0_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1_0_0.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1_1.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1_1_0.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1_1_1.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js diff --git a/src/ol/parser/ogc/wmscapabilities_v1_3_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js similarity index 100% rename from src/ol/parser/ogc/wmscapabilities_v1_3_0.js rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js diff --git a/src/ol/parser/ogc/wmtscapabilities.exports b/src/ol/parser/ogc/wmtscapabilitiesparser.exports similarity index 100% rename from src/ol/parser/ogc/wmtscapabilities.exports rename to src/ol/parser/ogc/wmtscapabilitiesparser.exports diff --git a/src/ol/parser/ogc/wmtscapabilities.js b/src/ol/parser/ogc/wmtscapabilitiesparser.js similarity index 100% rename from src/ol/parser/ogc/wmtscapabilities.js rename to src/ol/parser/ogc/wmtscapabilitiesparser.js diff --git a/src/ol/parser/ogc/wmtscapabilities_v1_0_0.js b/src/ol/parser/ogc/wmtscapabilitiesparser_v1_0_0.js similarity index 100% rename from src/ol/parser/ogc/wmtscapabilities_v1_0_0.js rename to src/ol/parser/ogc/wmtscapabilitiesparser_v1_0_0.js diff --git a/src/ol/parser/polyline.js b/src/ol/parser/polylineparser.js similarity index 100% rename from src/ol/parser/polyline.js rename to src/ol/parser/polylineparser.js diff --git a/src/ol/parser/topojson.exports b/src/ol/parser/topojsonparser.exports similarity index 100% rename from src/ol/parser/topojson.exports rename to src/ol/parser/topojsonparser.exports diff --git a/src/ol/parser/topojson.js b/src/ol/parser/topojsonparser.js similarity index 100% rename from src/ol/parser/topojson.js rename to src/ol/parser/topojsonparser.js diff --git a/src/ol/parser/wkt.exports b/src/ol/parser/wktparser.exports similarity index 100% rename from src/ol/parser/wkt.exports rename to src/ol/parser/wktparser.exports diff --git a/src/ol/parser/wkt.js b/src/ol/parser/wktparser.js similarity index 100% rename from src/ol/parser/wkt.js rename to src/ol/parser/wktparser.js diff --git a/src/ol/parser/xml.js b/src/ol/parser/xmlparser.js similarity index 100% rename from src/ol/parser/xml.js rename to src/ol/parser/xmlparser.js