Use {} instead of Object

We probably have these to trick the compiler but it's not needed anymore
This commit is contained in:
Frederic Junod
2016-02-25 09:15:31 +01:00
parent 5ad42f3b25
commit 148ef7afef
3 changed files with 46 additions and 46 deletions
+8 -8
View File
@@ -169,12 +169,12 @@ ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) {
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = Object({ ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'coordinates': ol.xml.makeReplacer( 'coordinates': ol.xml.makeReplacer(
ol.format.GML2.prototype.readFlatCoordinates_) ol.format.GML2.prototype.readFlatCoordinates_)
} }
}); };
/** /**
@@ -182,12 +182,12 @@ ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = Object({ ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'innerBoundaryIs': ol.format.GML2.prototype.innerBoundaryIsParser_, 'innerBoundaryIs': ol.format.GML2.prototype.innerBoundaryIsParser_,
'outerBoundaryIs': ol.format.GML2.prototype.outerBoundaryIsParser_ 'outerBoundaryIs': ol.format.GML2.prototype.outerBoundaryIsParser_
} }
}); };
/** /**
@@ -195,12 +195,12 @@ ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.BOX_PARSERS_ = Object({ ol.format.GML2.prototype.BOX_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'coordinates': ol.xml.makeArrayPusher( 'coordinates': ol.xml.makeArrayPusher(
ol.format.GML2.prototype.readFlatCoordinates_) ol.format.GML2.prototype.readFlatCoordinates_)
} }
}); };
/** /**
@@ -208,7 +208,7 @@ ol.format.GML2.prototype.BOX_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML2.prototype.GEOMETRY_PARSERS_ = Object({ ol.format.GML2.prototype.GEOMETRY_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'Point': ol.xml.makeReplacer(ol.format.GMLBase.prototype.readPoint), 'Point': ol.xml.makeReplacer(ol.format.GMLBase.prototype.readPoint),
'MultiPoint': ol.xml.makeReplacer( 'MultiPoint': ol.xml.makeReplacer(
@@ -224,4 +224,4 @@ ol.format.GML2.prototype.GEOMETRY_PARSERS_ = Object({
ol.format.GMLBase.prototype.readMultiPolygon), ol.format.GMLBase.prototype.readMultiPolygon),
'Box': ol.xml.makeReplacer(ol.format.GML2.prototype.readBox_) 'Box': ol.xml.makeReplacer(ol.format.GML2.prototype.readBox_)
} }
}); };
+24 -24
View File
@@ -453,12 +453,12 @@ ol.format.GML3.prototype.readFlatPosList_ = function(node, objectStack) {
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = Object({ ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'pos': ol.xml.makeReplacer(ol.format.GML3.prototype.readFlatPos_), 'pos': ol.xml.makeReplacer(ol.format.GML3.prototype.readFlatPos_),
'posList': ol.xml.makeReplacer(ol.format.GML3.prototype.readFlatPosList_) 'posList': ol.xml.makeReplacer(ol.format.GML3.prototype.readFlatPosList_)
} }
}); };
/** /**
@@ -466,12 +466,12 @@ ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = Object({ ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'interior': ol.format.GML3.prototype.interiorParser_, 'interior': ol.format.GML3.prototype.interiorParser_,
'exterior': ol.format.GML3.prototype.exteriorParser_ 'exterior': ol.format.GML3.prototype.exteriorParser_
} }
}); };
/** /**
@@ -479,7 +479,7 @@ ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.GEOMETRY_PARSERS_ = Object({ ol.format.GML3.prototype.GEOMETRY_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'Point': ol.xml.makeReplacer(ol.format.GMLBase.prototype.readPoint), 'Point': ol.xml.makeReplacer(ol.format.GMLBase.prototype.readPoint),
'MultiPoint': ol.xml.makeReplacer( 'MultiPoint': ol.xml.makeReplacer(
@@ -501,7 +501,7 @@ ol.format.GML3.prototype.GEOMETRY_PARSERS_ = Object({
ol.format.GML3.prototype.readMultiCurve_), ol.format.GML3.prototype.readMultiCurve_),
'Envelope': ol.xml.makeReplacer(ol.format.GML3.prototype.readEnvelope_) 'Envelope': ol.xml.makeReplacer(ol.format.GML3.prototype.readEnvelope_)
} }
}); };
/** /**
@@ -509,14 +509,14 @@ ol.format.GML3.prototype.GEOMETRY_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.MULTICURVE_PARSERS_ = Object({ ol.format.GML3.prototype.MULTICURVE_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'curveMember': ol.xml.makeArrayPusher( 'curveMember': ol.xml.makeArrayPusher(
ol.format.GML3.prototype.curveMemberParser_), ol.format.GML3.prototype.curveMemberParser_),
'curveMembers': ol.xml.makeArrayPusher( 'curveMembers': ol.xml.makeArrayPusher(
ol.format.GML3.prototype.curveMemberParser_) ol.format.GML3.prototype.curveMemberParser_)
} }
}); };
/** /**
@@ -524,14 +524,14 @@ ol.format.GML3.prototype.MULTICURVE_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = Object({ ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'surfaceMember': ol.xml.makeArrayPusher( 'surfaceMember': ol.xml.makeArrayPusher(
ol.format.GML3.prototype.surfaceMemberParser_), ol.format.GML3.prototype.surfaceMemberParser_),
'surfaceMembers': ol.xml.makeArrayPusher( 'surfaceMembers': ol.xml.makeArrayPusher(
ol.format.GML3.prototype.surfaceMemberParser_) ol.format.GML3.prototype.surfaceMemberParser_)
} }
}); };
/** /**
@@ -539,13 +539,13 @@ ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = Object({ ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'LineString': ol.xml.makeArrayPusher( 'LineString': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.readLineString), ol.format.GMLBase.prototype.readLineString),
'Curve': ol.xml.makeArrayPusher(ol.format.GML3.prototype.readCurve_) 'Curve': ol.xml.makeArrayPusher(ol.format.GML3.prototype.readCurve_)
} }
}); };
/** /**
@@ -553,12 +553,12 @@ ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = Object({ ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'Polygon': ol.xml.makeArrayPusher(ol.format.GMLBase.prototype.readPolygon), 'Polygon': ol.xml.makeArrayPusher(ol.format.GMLBase.prototype.readPolygon),
'Surface': ol.xml.makeArrayPusher(ol.format.GML3.prototype.readSurface_) 'Surface': ol.xml.makeArrayPusher(ol.format.GML3.prototype.readSurface_)
} }
}); };
/** /**
@@ -566,11 +566,11 @@ ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.SURFACE_PARSERS_ = Object({ ol.format.GML3.prototype.SURFACE_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'patches': ol.xml.makeReplacer(ol.format.GML3.prototype.readPatch_) 'patches': ol.xml.makeReplacer(ol.format.GML3.prototype.readPatch_)
} }
}); };
/** /**
@@ -578,11 +578,11 @@ ol.format.GML3.prototype.SURFACE_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.CURVE_PARSERS_ = Object({ ol.format.GML3.prototype.CURVE_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'segments': ol.xml.makeReplacer(ol.format.GML3.prototype.readSegment_) 'segments': ol.xml.makeReplacer(ol.format.GML3.prototype.readSegment_)
} }
}); };
/** /**
@@ -590,14 +590,14 @@ ol.format.GML3.prototype.CURVE_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.ENVELOPE_PARSERS_ = Object({ ol.format.GML3.prototype.ENVELOPE_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'lowerCorner': ol.xml.makeArrayPusher( 'lowerCorner': ol.xml.makeArrayPusher(
ol.format.GML3.prototype.readFlatPosList_), ol.format.GML3.prototype.readFlatPosList_),
'upperCorner': ol.xml.makeArrayPusher( 'upperCorner': ol.xml.makeArrayPusher(
ol.format.GML3.prototype.readFlatPosList_) ol.format.GML3.prototype.readFlatPosList_)
} }
}); };
/** /**
@@ -605,12 +605,12 @@ ol.format.GML3.prototype.ENVELOPE_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.PATCHES_PARSERS_ = Object({ ol.format.GML3.prototype.PATCHES_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'PolygonPatch': ol.xml.makeReplacer( 'PolygonPatch': ol.xml.makeReplacer(
ol.format.GML3.prototype.readPolygonPatch_) ol.format.GML3.prototype.readPolygonPatch_)
} }
}); };
/** /**
@@ -618,12 +618,12 @@ ol.format.GML3.prototype.PATCHES_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GML3.prototype.SEGMENTS_PARSERS_ = Object({ ol.format.GML3.prototype.SEGMENTS_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'LineStringSegment': ol.xml.makeReplacer( 'LineStringSegment': ol.xml.makeReplacer(
ol.format.GML3.prototype.readLineStringSegment_) ol.format.GML3.prototype.readLineStringSegment_)
} }
}); };
/** /**
+14 -14
View File
@@ -503,14 +503,14 @@ ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, object
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = Object({ ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'pointMember': ol.xml.makeArrayPusher( 'pointMember': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.pointMemberParser_), ol.format.GMLBase.prototype.pointMemberParser_),
'pointMembers': ol.xml.makeArrayPusher( 'pointMembers': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.pointMemberParser_) ol.format.GMLBase.prototype.pointMemberParser_)
} }
}); };
/** /**
@@ -518,14 +518,14 @@ ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = Object({ ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'lineStringMember': ol.xml.makeArrayPusher( 'lineStringMember': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.lineStringMemberParser_), ol.format.GMLBase.prototype.lineStringMemberParser_),
'lineStringMembers': ol.xml.makeArrayPusher( 'lineStringMembers': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.lineStringMemberParser_) ol.format.GMLBase.prototype.lineStringMemberParser_)
} }
}); };
/** /**
@@ -533,14 +533,14 @@ ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = Object({ ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'polygonMember': ol.xml.makeArrayPusher( 'polygonMember': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.polygonMemberParser_), ol.format.GMLBase.prototype.polygonMemberParser_),
'polygonMembers': ol.xml.makeArrayPusher( 'polygonMembers': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.polygonMemberParser_) ol.format.GMLBase.prototype.polygonMemberParser_)
} }
}); };
/** /**
@@ -548,12 +548,12 @@ ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = Object({ ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'Point': ol.xml.makeArrayPusher( 'Point': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_) ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_)
} }
}); };
/** /**
@@ -561,12 +561,12 @@ ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = Object({ ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'LineString': ol.xml.makeArrayPusher( 'LineString': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.readLineString) ol.format.GMLBase.prototype.readLineString)
} }
}); };
/** /**
@@ -574,12 +574,12 @@ ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private * @private
*/ */
ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = Object({ ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'Polygon': ol.xml.makeArrayPusher( 'Polygon': ol.xml.makeArrayPusher(
ol.format.GMLBase.prototype.readPolygon) ol.format.GMLBase.prototype.readPolygon)
} }
}); };
/** /**
@@ -587,12 +587,12 @@ ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = Object({
* @type {Object.<string, Object.<string, ol.xml.Parser>>} * @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @protected * @protected
*/ */
ol.format.GMLBase.prototype.RING_PARSERS = Object({ ol.format.GMLBase.prototype.RING_PARSERS = {
'http://www.opengis.net/gml' : { 'http://www.opengis.net/gml' : {
'LinearRing': ol.xml.makeReplacer( 'LinearRing': ol.xml.makeReplacer(
ol.format.GMLBase.prototype.readFlatLinearRing_) ol.format.GMLBase.prototype.readFlatLinearRing_)
} }
}); };
/** /**