| Index: trunk/extensions/geoserver/wikimaps.js |
| — | — | @@ -2,18 +2,18 @@ |
| 3 | 3 | // available under the following license. These derived classes are available |
| 4 | 4 | // under the same license |
| 5 | 5 | /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. |
| 6 | | - * See http://svn.openlayers.org/trunk/openlayers/release-license.txt |
| | 6 | + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt |
| 7 | 7 | * for the full text of the license. */ |
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | | - * @class |
| 11 | | - * |
| | 10 | + * @class |
| | 11 | + * |
| 12 | 12 | * @requires OpenLayers/Control/PanZoom.js |
| 13 | 13 | */ |
| 14 | 14 | OpenLayers.Control.Zoom = OpenLayers.Class.create(); |
| 15 | 15 | OpenLayers.Control.Zoom.X = 4; |
| 16 | 16 | OpenLayers.Control.Zoom.Y = 4; |
| 17 | | -OpenLayers.Control.Zoom.prototype = |
| | 17 | +OpenLayers.Control.Zoom.prototype = |
| 18 | 18 | OpenLayers.Class.inherit( OpenLayers.Control.PanZoom, { |
| 19 | 19 | |
| 20 | 20 | /** @type Array(...) */ |
| — | — | @@ -40,15 +40,15 @@ |
| 41 | 41 | }, |
| 42 | 42 | |
| 43 | 43 | /** clear the div and start over. |
| 44 | | - * |
| | 44 | + * |
| 45 | 45 | */ |
| 46 | 46 | redraw: function() { |
| 47 | 47 | if (this.div != null) { |
| 48 | 48 | this.div.innerHTML = ""; |
| 49 | | - } |
| | 49 | + } |
| 50 | 50 | this.draw(); |
| 51 | 51 | }, |
| 52 | | - |
| | 52 | + |
| 53 | 53 | /** |
| 54 | 54 | * @param {OpenLayers.Pixel} px |
| 55 | 55 | */ |
| — | — | @@ -68,30 +68,30 @@ |
| 69 | 69 | return this.div; |
| 70 | 70 | }, |
| 71 | 71 | |
| 72 | | - |
| | 72 | + |
| 73 | 73 | CLASS_NAME: "OpenLayers.Control.Zoom" |
| 74 | 74 | }); |
| 75 | 75 | /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. |
| 76 | | - * See http://svn.openlayers.org/trunk/openlayers/release-license.txt |
| | 76 | + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt |
| 77 | 77 | * for the full text of the license. */ |
| 78 | 78 | |
| 79 | | - |
| | 79 | + |
| 80 | 80 | /** |
| 81 | 81 | * @class |
| 82 | | - * |
| | 82 | + * |
| 83 | 83 | * @requires OpenLayers/Layer/HTTPRequest.js |
| 84 | 84 | * @requires OpenLayers/Layer/WMS.js |
| 85 | 85 | * @requires OpenLayers/Layer/WMS/Untiled.js |
| 86 | 86 | */ |
| 87 | 87 | OpenLayers.Layer.WMS.MultiUntiled = OpenLayers.Class.create(); |
| 88 | | -OpenLayers.Layer.WMS.MultiUntiled.prototype = |
| | 88 | +OpenLayers.Layer.WMS.MultiUntiled.prototype = |
| 89 | 89 | OpenLayers.Class.inherit( OpenLayers.Layer.WMS.Untiled, { |
| 90 | 90 | |
| 91 | 91 | /** which layers to use for which zoomlevel |
| 92 | 92 | * @type Array */ |
| 93 | 93 | layerForLevel: null, |
| 94 | | - |
| 95 | 94 | |
| | 95 | + |
| 96 | 96 | /** |
| 97 | 97 | * @constructor |
| 98 | 98 | * |
| — | — | @@ -104,41 +104,41 @@ |
| 105 | 105 | //uppercase params |
| 106 | 106 | params = OpenLayers.Util.upperCaseObject(params); |
| 107 | 107 | newArguments.push(name, url, params, options); |
| 108 | | - OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this, |
| | 108 | + OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this, |
| 109 | 109 | newArguments); |
| 110 | 110 | OpenLayers.Util.applyDefaults( |
| 111 | | - this.params, |
| | 111 | + this.params, |
| 112 | 112 | OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS) |
| 113 | 113 | ); |
| 114 | 114 | |
| 115 | | - // unless explicitly set in options, if the layer is transparent, |
| 116 | | - // it will be an overlay |
| | 115 | + // unless explicitly set in options, if the layer is transparent, |
| | 116 | + // it will be an overlay |
| 117 | 117 | if ((options == null) || (options.isBaseLayer == null)) { |
| 118 | | - this.isBaseLayer = ((this.params.TRANSPARENT != "true") && |
| | 118 | + this.isBaseLayer = ((this.params.TRANSPARENT != "true") && |
| 119 | 119 | (this.params.TRANSPARENT != true)); |
| 120 | 120 | } |
| 121 | 121 | this.layerForLevel = new Array(); |
| 122 | 122 | for ( i=0; i<=35; i++ ) { |
| 123 | 123 | this.layerForLevel[i] = this.params.LAYERS; |
| 124 | 124 | } |
| 125 | | - }, |
| | 125 | + }, |
| 126 | 126 | |
| 127 | 127 | /** |
| 128 | | - * |
| | 128 | + * |
| 129 | 129 | */ |
| 130 | 130 | destroy: function() { |
| 131 | 131 | this.layerForLevel = null; |
| 132 | 132 | OpenLayers.Layer.WMS.Untiled.prototype.destroy.apply(this, arguments); |
| 133 | 133 | }, |
| 134 | | - |
| | 134 | + |
| 135 | 135 | /** |
| 136 | 136 | * @param {Object} obj |
| 137 | | - * |
| | 137 | + * |
| 138 | 138 | * @returns An exact clone of this OpenLayers.Layer.WMS.Untiled |
| 139 | 139 | * @type OpenLayers.Layer.WMS.Untiled |
| 140 | 140 | */ |
| 141 | 141 | clone: function (obj) { |
| 142 | | - |
| | 142 | + |
| 143 | 143 | if (obj == null) { |
| 144 | 144 | obj = new OpenLayers.Layer.WMS.MultiUntiled(this.name, |
| 145 | 145 | this.url, |
| — | — | @@ -152,11 +152,11 @@ |
| 153 | 153 | // copy/set any non-init, non-simple values here |
| 154 | 154 | |
| 155 | 155 | return obj; |
| 156 | | - }, |
| 157 | | - |
| 158 | | - |
| | 156 | + }, |
| | 157 | + |
| | 158 | + |
| 159 | 159 | /** Once HTTPRequest has set the map, we can load the image div |
| 160 | | - * |
| | 160 | + * |
| 161 | 161 | * @param {OpenLayers.Map} map |
| 162 | 162 | */ |
| 163 | 163 | setMap: function(map) { |
| — | — | @@ -165,13 +165,13 @@ |
| 166 | 166 | |
| 167 | 167 | /** When it is not a dragging move (ie when done dragging) |
| 168 | 168 | * reload and recenter the div. |
| 169 | | - * |
| | 169 | + * |
| 170 | 170 | * @param {OpenLayers.Bounds} bounds |
| 171 | 171 | * @param {Boolean} zoomChanged |
| 172 | 172 | * @param {Boolean} dragging |
| 173 | 173 | */ |
| 174 | 174 | moveTo:function(bounds, zoomChanged, dragging) { |
| 175 | | - |
| | 175 | + |
| 176 | 176 | if (bounds == null) { |
| 177 | 177 | bounds = this.map.getExtent(); |
| 178 | 178 | } |
| — | — | @@ -187,7 +187,7 @@ |
| 188 | 188 | setLayerForLevel:function(layer,zoomlevel) { |
| 189 | 189 | this.layerForLevel[zoomlevel] = layer; |
| 190 | 190 | }, |
| 191 | | - |
| | 191 | + |
| 192 | 192 | /** @final @type String */ |
| 193 | 193 | CLASS_NAME: "OpenLayers.Layer.WMS.MultiUntiled" |
| 194 | 194 | }); |
| — | — | @@ -258,7 +258,7 @@ |
| 259 | 259 | popup = new OpenLayers.Popup( "popup", clickCoord, new OpenLayers.Size(250,100),HTML,true); |
| 260 | 260 | popup.setOpacity(0.8); |
| 261 | 261 | map.addPopup(popup); |
| 262 | | - } else { |
| | 262 | + } else { |
| 263 | 263 | $('selectbox').style.display='block'; |
| 264 | 264 | $('selectboxbody').innerHTML = HTML; |
| 265 | 265 | } |
| — | — | @@ -315,7 +315,7 @@ |
| 316 | 316 | function WikiMapsFullscreen() { |
| 317 | 317 | center = map.getCenter(); |
| 318 | 318 | zoom = map.getZoom(); |
| 319 | | - document.location = wgServer + wgArticlePath.replace( /\$1/, "Special:Wikimaps" ) |
| | 319 | + document.location = wgServer + wgArticlePath.replace( /\$1/, "Special:Wikimaps" ) |
| 320 | 320 | + '?lon='+center.lon+'&lat='+center.lat+'&zoom='+zoom ; |
| 321 | 321 | } |
| 322 | 322 | $('wikimapsfullscreen').innerHTML='<a id="wikimapsfullscreenlink">Fullscreen</a>'; |
| Index: trunk/extensions/geoserver/WFS.php |
| — | — | @@ -22,7 +22,6 @@ |
| 23 | 23 | exit( 1 ) ; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | | - |
| 27 | 26 | class WFS { |
| 28 | 27 | |
| 29 | 28 | function WFS( $url ) { |
| — | — | @@ -65,8 +64,8 @@ |
| 66 | 65 | $this->delete( $name ); |
| 67 | 66 | $this->save( $name, $displaytitle, $major, $minor, $lat, $lon, $population ); |
| 68 | 67 | } |
| 69 | | - |
| 70 | | - |
| | 68 | + |
| | 69 | + |
| 71 | 70 | private function transaction( $body ) { |
| 72 | 71 | global $wgWFSHost, $wgWFSPort, $wgWFSPath; |
| 73 | 72 | $result=""; |
| — | — | @@ -91,5 +90,3 @@ |
| 92 | 91 | return $result; |
| 93 | 92 | } |
| 94 | 93 | } |
| 95 | | - |
| 96 | | -?> |
| Index: trunk/extensions/geoserver/geoserver.php |
| — | — | @@ -12,7 +12,6 @@ |
| 13 | 13 | 'description' => 'Allows geotagging using the <nowiki><geo></nowiki> tag. Saves geodata in a WFS-T server, e.g. geoserver.', |
| 14 | 14 | ); |
| 15 | 15 | |
| 16 | | - |
| 17 | 16 | $wgExtensionFunctions[] = "wfGeoserverExtension"; |
| 18 | 17 | |
| 19 | 18 | /** |
| — | — | @@ -27,7 +26,8 @@ |
| 28 | 27 | } |
| 29 | 28 | |
| 30 | 29 | global $wgAutoloadClasses; |
| 31 | | -$wgAutoloadClasses['WFS'] = dirname(__FILE__) . '/WFS.php'; |
| | 30 | +$dir = dirname(__FILE__) . '/'; |
| | 31 | +$wgAutoloadClasses['WFS'] = $dir . 'WFS.php'; |
| 32 | 32 | |
| 33 | 33 | require_once( dirname(__FILE__) . '/SpecialWikimaps.php' ); |
| 34 | 34 | /** |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | </script> |
| 75 | 75 | <div id="wikimaps"><div class="wikimapslabel" >Map</div><div class="wikimapslabel" id="wikimapsfullscreen">Fullscreen</div><br /><div id="map" style="width:300px; height:300px;"></div><div id="selectbox" style="display:none;XXposition: absolute; XXtop:10em; XXleft:10em; width:300px;background:#02048C;color: white; padding-bottom:1px;"><div id="close" style="float:right; background:grey; color:black;font-size:small;margin:1px;padding-left:3px; padding-right:3px;pointer:hand;">X</div><span style="margin-left:3px;">Result</span><div id="selectboxbody" style="background:white; margin:1px; padding:3px; color:black;"></div></div></div>'; |
| 76 | 76 | } |
| 77 | | - |
| | 77 | + |
| 78 | 78 | return $r; |
| 79 | 79 | } |
| 80 | 80 | |
| — | — | @@ -88,7 +88,7 @@ |
| 89 | 89 | $wfs = new WFS( "" ); |
| 90 | 90 | |
| 91 | 91 | if ( $wgTitle->getNamespace() == NS_MAIN ) { |
| 92 | | - $result = $wfs->update( $wgTitle->getDBkey(), $wgTitle->getText(), |
| | 92 | + $result = $wfs->update( $wgTitle->getDBkey(), $wgTitle->getText(), |
| 93 | 93 | $GeoserverParameters["type_major"], $GeoserverParameters["type_minor"], |
| 94 | 94 | $GeoserverParameters["lat"], $GeoserverParameters["lon"], |
| 95 | 95 | $GeoserverParameters["population"] ); |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | return ' |
| 103 | 103 | var wgWikiMapsIcon = "' . $wgWikiMapsIcon .'"; |
| 104 | 104 | if ( wgFullscreen == undefined ) { var wgFullscreen = false; }' . generateWikiMapsLayersJS(); |
| 105 | | -} |
| | 105 | +} |
| 106 | 106 | |
| 107 | 107 | function generateWikiMapsLayersJS() { |
| 108 | 108 | global $wgWikiMapsLayers; |
| — | — | @@ -148,8 +148,3 @@ |
| 149 | 149 | } "; |
| 150 | 150 | return $WMSLayer; |
| 151 | 151 | } |
| 152 | | - |
| 153 | | - |
| 154 | | - |
| 155 | | - |
| 156 | | -?> |
| Index: trunk/extensions/geoserver/SpecialWikimaps_body.php |
| — | — | @@ -1,8 +1,8 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | | -class Wikimaps extends SpecialPage { |
| | 4 | +class SpecialWikimaps extends SpecialPage { |
| 5 | 5 | |
| 6 | | - function Wikimaps() { |
| | 6 | + function __construct() { |
| 7 | 7 | SpecialPage::SpecialPage( 'Wikimaps', 'wikimaps' ); |
| 8 | 8 | } |
| 9 | 9 | |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | border: 1px solid blue; |
| 28 | 28 | position: fixed; |
| 29 | 29 | background: papayawhip; |
| 30 | | - |
| | 30 | + |
| 31 | 31 | } |
| 32 | 32 | small.popup { |
| 33 | 33 | margin-top: 0em; |
| — | — | @@ -34,8 +34,8 @@ |
| 35 | 35 | ul.popup { |
| 36 | 36 | margin-top: 0em; |
| 37 | 37 | } |
| 38 | | - div.displaytitle { |
| 39 | | - border-bottom: solid 1px silver; |
| | 38 | + div.displaytitle { |
| | 39 | + border-bottom: solid 1px silver; |
| 40 | 40 | margin-bottom:6px; |
| 41 | 41 | } |
| 42 | 42 | </style> |
| — | — | @@ -63,4 +63,3 @@ |
| 64 | 64 | |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | | - |
| Index: trunk/extensions/geoserver/SpecialWikimaps.php |
| — | — | @@ -21,10 +21,9 @@ |
| 22 | 22 | global $wgWikimapsMessages; |
| 23 | 23 | $wgWikimapsMessages = array(); |
| 24 | 24 | |
| 25 | | -if ( !function_exists( 'extAddSpecialPage' ) ) { |
| 26 | | - require( dirname(__FILE__) . '/../ExtensionFunctions.php' ); |
| 27 | | -} |
| 28 | | -extAddSpecialPage( dirname(__FILE__) . '/SpecialWikimaps_body.php', 'Wikimaps', 'Wikimaps' ); |
| | 25 | +$dir = dirname(__FILE__) . '/'; |
| | 26 | +$wgAutoloadClasses['SpecialWikimaps'] = $dir . 'SpecialWikimaps_body.php'; |
| | 27 | +$wgSpecialPages['Wikimaps'] = 'SpecialWikimaps'; |
| 29 | 28 | |
| 30 | 29 | function wfSpecialWikimaps() { |
| 31 | 30 | # Add messages |
| — | — | @@ -34,5 +33,3 @@ |
| 35 | 34 | } |
| 36 | 35 | # print "<pre>"; print_r( $wgSpecialPages ); print "</pre>"; |
| 37 | 36 | } |
| 38 | | -?> |
| 39 | | - |
| Index: trunk/extensions/geoserver/README |
| — | — | @@ -42,4 +42,3 @@ |
| 43 | 43 | 15 => 'topp:border,topp:wikipedia', |
| 44 | 44 | ) ), |
| 45 | 45 | ); |
| 46 | | - |
| Index: trunk/extensions/geoserver/featureCodes.conf |
| — | — | @@ -5,15 +5,15 @@ |
| 6 | 6 | A.ADM.4 fourth-order administrative division a subdivision of a third-order administrative division |
| 7 | 7 | A.ADM.D administrative division an administrative division of a country, undifferentiated as to administrative level |
| 8 | 8 | A.LTER leased area a tract of land leased by the United Kingdom from the People's Republic of China to form part of Hong Kong |
| 9 | | -A.PCL political entity |
| 10 | | -A.PCL.D dependent political entity |
| 11 | | -A.PCL.F freely associated state |
| 12 | | -A.PCL.I independent political entity |
| 13 | | -A.PCL.IX section of independent political entity |
| 14 | | -A.PCL.S semi-independent political entity |
| | 9 | +A.PCL political entity |
| | 10 | +A.PCL.D dependent political entity |
| | 11 | +A.PCL.F freely associated state |
| | 12 | +A.PCL.I independent political entity |
| | 13 | +A.PCL.IX section of independent political entity |
| | 14 | +A.PCL.S semi-independent political entity |
| 15 | 15 | A.PRSH parish an ecclesiastical district |
| 16 | | -A.TERR territory |
| 17 | | -A.ZN zone |
| | 16 | +A.TERR territory |
| | 17 | +A.ZN zone |
| 18 | 18 | A.ZN.B buffer zone a zone recognized as a buffer between two nations in which military presence is minimal or absent |
| 19 | 19 | H.AIRS seaplane landing area a place on a waterbody where floatplanes land and take off |
| 20 | 20 | H.ANCH anchorage an area where vessels may anchor |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | H.BGHT bight(s) an open body of water forming a slight recession in a coastline |
| 24 | 24 | H.BNK bank(s) an elevation, typically located on a shelf, over which the depth of water is relatively shallow but sufficient for most surface navigation |
| 25 | 25 | H.BNK.R stream bank a sloping margin of a stream channel which normally confines the stream to its channel on land |
| 26 | | -H.BNK.X section of bank |
| | 26 | +H.BNK.X section of bank |
| 27 | 27 | H.BOG bog(s) a wetland characterized by peat forming sphagnum moss, sedge, and other acid-water plants |
| 28 | 28 | H.CAPG icecap a dome-shaped mass of glacial ice covering an area of mountain summits or other high lands; smaller than an ice sheet |
| 29 | 29 | H.CHN channel the deepest part of a stream, bay, lagoon, or strait, through which the main current flows |
| — | — | @@ -36,9 +36,9 @@ |
| 37 | 37 | H.CNL.D drainage canal an artificial waterway carrying water away from a wetland or from drainage ditches |
| 38 | 38 | H.CNL.I irrigation canal a canal which serves as a main conduit for irrigation water |
| 39 | 39 | H.CNL.N navigation canal(s) a watercourse constructed for navigation of vessels |
| 40 | | -H.CNL.Q abandoned canal |
| | 40 | +H.CNL.Q abandoned canal |
| 41 | 41 | H.CNL.SB underground irrigation canal(s) a gently inclined underground tunnel bringing water for irrigation from aquifers |
| 42 | | -H.CNL.X section of canal |
| | 42 | +H.CNL.X section of canal |
| 43 | 43 | H.COVE cove(s) a small coastal indentation, smaller than a bay |
| 44 | 44 | H.CRKT tidal creek(s) a meandering channel in a coastal wetland subject to bi-directional tidal currents |
| 45 | 45 | H.CRNT current a horizontal flow of water in a given direction with uniform velocity |
| — | — | @@ -56,34 +56,34 @@ |
| 57 | 57 | H.FJD fjord a long, narrow, steep-walled, deep-water arm of the sea at high latitudes, usually along mountainous coasts |
| 58 | 58 | H.FJDS fjords long, narrow, steep-walled, deep-water arms of the sea at high latitudes, usually along mountainous coasts |
| 59 | 59 | H.FLLS waterfall(s) a perpendicular or very steep descent of the water of a stream |
| 60 | | -H.FLLSX section of waterfall(s) |
| | 60 | +H.FLLSX section of waterfall(s) |
| 61 | 61 | H.FLTM mud flat(s) a relatively level area of mud either between high and low tide lines, or subject to flooding |
| 62 | 62 | H.FLTT tidal flat(s) a large flat area of mud or sand attached to the shore and alternately covered and uncovered by the tide |
| 63 | 63 | H.GLCR glacier(s) a mass of ice, usually at high latitudes or high elevations, with sufficient thickness to flow away from the source area in lobes, tongues, or masses |
| 64 | 64 | H.GULF gulf a large recess in the coastline, larger than a bay |
| 65 | 65 | H.GYSR geyser a type of hot spring with intermittent eruptions of jets of hot water and steam |
| 66 | 66 | H.HBR harbor(s) a haven or space of deep water so sheltered by the adjacent land as to afford a safe anchorage for ships |
| 67 | | -H.HBR.X section of harbor |
| | 67 | +H.HBR.X section of harbor |
| 68 | 68 | H.INLT inlet a narrow waterway extending into the land, or connecting a bay or lagoon with a larger body of water |
| 69 | 69 | H.INLT.Q former inlet an inlet which has been filled in, or blocked by deposits |
| 70 | 70 | H.LBED lake bed(s) a dried up or drained area of a former lake |
| 71 | 71 | H.LGN lagoon a shallow coastal waterbody, completely or partly separated from a larger body of water by a barrier island, coral reef or other depositional feature |
| 72 | 72 | H.LGN.S lagoons shallow coastal waterbodies, completely or partly separated from a larger body of water by a barrier island, coral reef or other depositional feature |
| 73 | | -H.LGN.X section of lagoon |
| | 73 | +H.LGN.X section of lagoon |
| 74 | 74 | H.LK lake a large inland body of standing water |
| 75 | 75 | H.LK.C crater lake a lake in a crater or caldera |
| 76 | | -H.LK.I intermittent lake |
| | 76 | +H.LK.I intermittent lake |
| 77 | 77 | H.LK.N salt lake an inland body of salt water with no outlet |
| 78 | | -H.LK.NI intermittent salt lake |
| | 78 | +H.LK.NI intermittent salt lake |
| 79 | 79 | H.LK.O oxbow lake a crescent-shaped lake commonly found adjacent to meandering streams |
| 80 | | -H.LK.OI intermittent oxbow lake |
| | 80 | +H.LK.OI intermittent oxbow lake |
| 81 | 81 | H.LK.S lakes large inland bodies of standing water |
| 82 | 82 | H.LK.SB underground lake a standing body of water in a cave |
| 83 | 83 | H.LK.SC crater lakes lakes in a crater or caldera |
| 84 | | -H.LK.SI intermittent lakes |
| | 84 | +H.LK.SI intermittent lakes |
| 85 | 85 | H.LK.SN salt lakes inland bodies of salt water with no outlet |
| 86 | | -H.LK.SNI intermittent salt lakes |
| 87 | | -H.LK.X section of lake |
| | 86 | +H.LK.SNI intermittent salt lakes |
| | 87 | +H.LK.X section of lake |
| 88 | 88 | H.MFGN salt evaporation ponds diked salt ponds used in the production of solar evaporated salt |
| 89 | 89 | H.MGV mangrove swamp a tropical tidal mud flat characterized by mangrove vegetation |
| 90 | 90 | H.MOOR moor(s) an area of open ground overlaid with wet peaty soils |
| — | — | @@ -93,24 +93,24 @@ |
| 94 | 94 | H.OCN ocean one of the major divisions of the vast expanse of salt water covering part of the earth |
| 95 | 95 | H.OVF overfalls an area of breaking waves caused by the meeting of currents or by waves moving against the current |
| 96 | 96 | H.PND pond a small standing waterbody |
| 97 | | -H.PND.I intermittent pond |
| | 97 | +H.PND.I intermittent pond |
| 98 | 98 | H.PND.N salt pond a small standing body of salt water often in a marsh or swamp, usually along a seacoast |
| 99 | | -H.PND.NI intermittent salt pond(s) |
| | 99 | +H.PND.NI intermittent salt pond(s) |
| 100 | 100 | H.PND.S ponds small standing waterbodies |
| 101 | 101 | H.PND.SF fishponds ponds or enclosures in which fish are kept or raised |
| 102 | | -H.PND.SI intermittent ponds |
| | 102 | +H.PND.SI intermittent ponds |
| 103 | 103 | H.PND.SN salt ponds small standing bodies of salt water often in a marsh or swamp, usually along a seacoast |
| 104 | 104 | H.POOL pool(s) a small and comparatively still, deep part of a larger body of water such as a stream or harbor; or a small body of standing water |
| 105 | | -H.POOL.I intermittent pool |
| | 105 | +H.POOL.I intermittent pool |
| 106 | 106 | H.RCH reach a straight section of a navigable stream or channel between two bends |
| 107 | 107 | H.RDGG icecap ridge a linear elevation on an icecap |
| 108 | 108 | H.RDST roadstead an open anchorage affording less protection than a harbor |
| 109 | 109 | H.RF reef(s) a surface-navigation hazard composed of consolidated material |
| 110 | 110 | H.RF.C coral reef(s) a surface-navigation hazard composed of coral |
| 111 | | -H.RF.X section of reef |
| | 111 | +H.RF.X section of reef |
| 112 | 112 | H.RPDS rapids a turbulent section of a stream associated with a steep, irregular stream bed |
| 113 | 113 | H.RSV reservoir(s) an artificial pond or lake |
| 114 | | -H.RSV.I intermittent reservoir |
| | 114 | +H.RSV.I intermittent reservoir |
| 115 | 115 | H.RSV.T water tank a contained pool or tank of water at, below, or above ground level |
| 116 | 116 | H.RVN ravine(s) a small, narrow, deep, steep-sided stream channel, smaller than a gorge |
| 117 | 117 | H.SBKH sabkha(s) a salt flat or salt encrusted plain subject to periodic inundation from flooding or high tides |
| — | — | @@ -127,13 +127,13 @@ |
| 128 | 128 | H.STM.C canalized stream a stream that has been substantially ditched, diked, or straightened |
| 129 | 129 | H.STM.D distributary(-ies) a branch which flows away from the main stream, as in a delta or irrigation canal |
| 130 | 130 | H.STM.H headwaters the source and upper part of a stream, including the upper drainage basin |
| 131 | | -H.STM.I intermittent stream |
| 132 | | -H.STM.IX section of intermittent stream |
| | 131 | +H.STM.I intermittent stream |
| | 132 | +H.STM.IX section of intermittent stream |
| 133 | 133 | H.STM.M stream mouth(s) a place where a stream discharges into a lagoon, lake, or the sea |
| 134 | 134 | H.STM.Q abandoned watercourse a former stream or distributary no longer carrying flowing water, but still evident due to lakes, wetland, topographic or vegetation patterns |
| 135 | 135 | H.STM.S streams bodies of running water moving to a lower level in a channel on land |
| 136 | 136 | H.STM.SB lost river a surface stream that disappears into an underground channel, or dries up in an arid area |
| 137 | | -H.STM.X section of stream |
| | 137 | +H.STM.X section of stream |
| 138 | 138 | H.STRT strait a relatively narrow waterway, usually narrower and less extensive than a sound, connecting two larger bodies of water |
| 139 | 139 | H.SWMP swamp a wetland dominated by tree vegetation |
| 140 | 140 | H.SYSI irrigation system a network of ditches and one or more of the following elements: water supply, reservoir, canal, pump, well, drain, etc. |
| — | — | @@ -143,13 +143,13 @@ |
| 144 | 144 | H.WAD.J wadi junction a place where two or more wadies join |
| 145 | 145 | H.WAD.M wadi mouth the lower terminus of a wadi where it widens into an adjoining floodplain, depression, or waterbody |
| 146 | 146 | H.WAD.S wadies valleys or ravines, bounded by relatively steep banks, which in the rainy season become watercourses; found primarily in North Africa and the Middle East |
| 147 | | -H.WAD.X section of wadi |
| | 147 | +H.WAD.X section of wadi |
| 148 | 148 | H.WHRL whirlpool a turbulent, rotating movement of water in a stream |
| 149 | 149 | H.WLL well a cylindrical hole, pit, or tunnel drilled or dug down to a depth from which water, oil, or gas can be pumped or brought to the surface |
| 150 | | -H.WLL.Q abandoned well |
| | 150 | +H.WLL.Q abandoned well |
| 151 | 151 | H.WLL.S wells cylindrical holes, pits, or tunnels drilled or dug down to a depth from which water, oil, or gas can be pumped or brought to the surface |
| 152 | 152 | H.WTLD wetland an area subject to inundation, usually characterized by bog, marsh, or swamp vegetation |
| 153 | | -H.WTLD.I intermittent wetland |
| | 153 | +H.WTLD.I intermittent wetland |
| 154 | 154 | H.WTRC watercourse a natural, well-defined channel produced by flowing water, or an artificial channel designed to carry flowing water |
| 155 | 155 | H.WTRH waterhole(s) a natural hole, hollow, or small depression that contains water, used by man and animals, especially in arid areas |
| 156 | 156 | L.AGRC agricultural colony a tract of land set aside for agricultural settlement |
| — | — | @@ -161,7 +161,7 @@ |
| 162 | 162 | L.CMN common a park or pasture for community use |
| 163 | 163 | L.CNS concession area a lease of land by a government for economic development, e.g., mining, forestry |
| 164 | 164 | L.COLF coalfield a region in which coal deposits of possible economic value occur |
| 165 | | -L.CONT continent : Europe, Africa, Oceania, North America, South America, Oceania,Antarctica |
| | 165 | +L.CONT continent : Europe, Africa, Oceania, North America, South America, Oceania,Antarctica |
| 166 | 166 | L.CST coast a zone of variable width straddling the shoreline |
| 167 | 167 | L.CTRB business center a place where a number of businesses are located |
| 168 | 168 | L.DEVH housing development a tract of land on which many houses of similar design are built according to a development plan |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | L.PRK park an area, often of forested land, maintained as a place of beauty, or for recreation |
| 185 | 185 | L.PRT port a place provided with terminal and transfer facilities for loading and discharging waterborne cargo or passengers, usually located in a harbor |
| 186 | 186 | L.QCKS quicksand an area where loose sand with water moving through it may become unstable when heavy objects are placed at the surface, causing them to sink |
| 187 | | -L.REP republic |
| | 187 | +L.REP republic |
| 188 | 188 | L.RES reserve a tract of public land reserved for future use or restricted as to use |
| 189 | 189 | L.RES.A agricultural reserve a tract of land reserved for agricultural reclamation and/or development |
| 190 | 190 | L.RES.F forest reserve a forested area set aside for preservation or controlled use |
| — | — | @@ -199,18 +199,18 @@ |
| 200 | 200 | L.SALT salt area a shallow basin or flat where salt accumulates after periodic inundation |
| 201 | 201 | L.SNOW snowfield an area of permanent snow and ice forming the accumulation area of a glacier |
| 202 | 202 | L.TRB tribal area a tract of land used by nomadic or other tribes |
| 203 | | -L.ZZZZZ master source holdings list |
| | 203 | +L.ZZZZZ master source holdings list |
| 204 | 204 | P.PPL populated place a city, town, village, or other agglomeration of buildings where people live and work |
| 205 | 205 | P.PPL.A seat of a first-order administrative division seat of a first-order administrative division (PPLC takes precedence over PPLA) |
| 206 | | -P.PPL.C capital of a political entity |
| 207 | | -P.PPL.G seat of government of a political entity |
| | 206 | +P.PPL.C capital of a political entity |
| | 207 | +P.PPL.G seat of government of a political entity |
| 208 | 208 | P.PPL.L populated locality an area similar to a locality but with a small group of dwellings or other buildings |
| 209 | | -P.PPL.Q abandoned populated place |
| | 209 | +P.PPL.Q abandoned populated place |
| 210 | 210 | P.PPL.R religious populated place a populated place whose population is largely engaged in religious occupations |
| 211 | 211 | P.PPL.S populated places cities, towns, villages, or other agglomerations of buildings where people live and work |
| 212 | 212 | P.PPL.W destroyed populated place a village, town or city destroyed by a natural disaster, or by war |
| 213 | | -P.PPL.X section of populated place |
| 214 | | -P.STLMT israeli settlement |
| | 213 | +P.PPL.X section of populated place |
| | 214 | +P.STLMT israeli settlement |
| 215 | 215 | R.CSWY causeway a raised roadway across wet ground or shallow water |
| 216 | 216 | R.CSWY.Q former causeway a causeway no longer used for transportation |
| 217 | 217 | R.OILP oil pipeline a pipeline used for transporting oil |
| — | — | @@ -223,7 +223,7 @@ |
| 224 | 224 | R.RD.JCT road junction a place where two or more roads join |
| 225 | 225 | R.RJCT railroad junction a place where two or more railroad tracks join |
| 226 | 226 | R.RR railroad a permanent twin steel-rail track on which freight and passenger cars move long distances |
| 227 | | -R.RR.Q abandoned railroad |
| | 227 | +R.RR.Q abandoned railroad |
| 228 | 228 | R.RTE caravan route the route taken by caravans |
| 229 | 229 | R.RYD railroad yard a system of tracks used for the making up of trains, and switching and storing freight cars |
| 230 | 230 | R.ST street a paved urban thoroughfare |
| — | — | @@ -241,7 +241,7 @@ |
| 242 | 242 | S.AIR.F airfield a place on land where aircraft land and take off; no facilities provided for the commercial handling of passengers and cargo |
| 243 | 243 | S.AIR.H heliport a place where helicopters land and take off |
| 244 | 244 | S.AIR.P airport a place where aircraft regularly land and take off, with runways, navigational aids, and major facilities for the commercial handling of passengers and cargo |
| 245 | | -S.AIR.Q abandoned airfield |
| | 245 | +S.AIR.Q abandoned airfield |
| 246 | 246 | S.AMTH amphitheater an oval or circular structure with rising tiers of seats about a stage or open space |
| 247 | 247 | S.ANS ancient site a place where archeological remains, old structures, or cultural artifacts are located |
| 248 | 248 | S.ARCH arch a natural or man-made structure in the form of an arch |
| — | — | @@ -266,7 +266,7 @@ |
| 267 | 267 | S.CMP.LA labor camp a camp used by migrant or temporary laborers |
| 268 | 268 | S.CMP.MN mining camp a camp used by miners |
| 269 | 269 | S.CMP.O oil camp a camp used by oilfield workers |
| 270 | | -S.CMP.Q abandoned camp |
| | 270 | +S.CMP.Q abandoned camp |
| 271 | 271 | S.CMP.RF refugee camp a camp used by refugees |
| 272 | 272 | S.CMTY cemetery a burial place or ground |
| 273 | 273 | S.COMC communication center a facility, including buildings, antennae, towers and electronic equipment for receiving and transmitting information |
| — | — | @@ -298,11 +298,11 @@ |
| 299 | 299 | S.EST.SG sugar plantation an estate that specializes in growing sugar cane |
| 300 | 300 | S.EST.SL sisal plantation an estate that specializes in growing sisal |
| 301 | 301 | S.EST.T tea plantation an estate which specializes in growing tea bushes |
| 302 | | -S.EST.X section of estate |
| | 302 | +S.EST.X section of estate |
| 303 | 303 | S.FCL facility a building or buildings housing a center, institute, foundation, hospital, prison, mission, courthouse, etc. |
| 304 | 304 | S.FNDY foundry a building or works where metal casting is carried out |
| 305 | 305 | S.FRM farm a tract of land with associated buildings devoted to agriculture |
| 306 | | -S.FRM.Q abandoned farm |
| | 306 | +S.FRM.Q abandoned farm |
| 307 | 307 | S.FRM.S farms tracts of land with associated buildings devoted to agriculture |
| 308 | 308 | S.FRM.T farmstead the buildings and adjacent service areas of a farm |
| 309 | 309 | S.FT fort a defensive structure or earthworks |
| — | — | @@ -339,7 +339,7 @@ |
| 340 | 340 | S.MFG.LM limekiln a furnace in which limestone is reduced to lime |
| 341 | 341 | S.MFG.M munitions plant a factory where ammunition is made |
| 342 | 342 | S.MFG.PH phosphate works a facility for producing fertilizer |
| 343 | | -S.MFG.Q abandoned factory |
| | 343 | +S.MFG.Q abandoned factory |
| 344 | 344 | S.MFG.SG sugar refinery a facility for converting raw sugar into refined sugar |
| 345 | 345 | S.MKT market a place where goods are bought and sold at regular intervals |
| 346 | 346 | S.ML mill(s) a building housing machines for transforming, shaping, finishing, grinding, or extracting products |
| — | — | @@ -362,13 +362,13 @@ |
| 363 | 363 | S.MN.NI nickel mine(s) a mine where nickel ore is extracted |
| 364 | 364 | S.MN.PB lead mine(s) a mine where lead ore is extracted |
| 365 | 365 | S.MN.PL placer mine(s) a place where heavy metals are concentrated and running water is used to extract them from unconsolidated sediments |
| 366 | | -S.MN.Q abandoned mine |
| | 366 | +S.MN.Q abandoned mine |
| 367 | 367 | S.MN.QR quarry(-ies) a surface mine where building stone or gravel and sand, etc. are extracted |
| 368 | 368 | S.MN.SN tin mine(s) a mine where tin ore is extracted |
| 369 | 369 | S.MOLE mole a massive structure of masonry or large stones serving as a pier or breakwater |
| 370 | 370 | S.MSQE mosque a building for public Islamic worship |
| 371 | 371 | S.MSSN mission a place characterized by dwellings, school, church, hospital and other facilities operated by a religious group for the purpose of providing charitable services and to propagate religion |
| 372 | | -S.MSSN.Q abandoned mission |
| | 372 | +S.MSSN.Q abandoned mission |
| 373 | 373 | S.MSTY monastery a building and grounds where a community of monks lives in seclusion |
| 374 | 374 | S.MUS museum a building where objects of permanent interest in one or more of the arts and sciences are preserved and exhibited |
| 375 | 375 | S.NOV novitiate a religious house or school where novices are trained |
| — | — | @@ -377,7 +377,7 @@ |
| 378 | 378 | S.OBS observatory a facility equipped for observation of atmospheric or space phenomena |
| 379 | 379 | S.OB.SR radio observatory a facility equipped with an array of antennae for receiving radio waves from space |
| 380 | 380 | S.OILJ oil pipeline junction a section of an oil pipeline where two or more pipes join together |
| 381 | | -S.OILQ abandoned oil well |
| | 381 | +S.OILQ abandoned oil well |
| 382 | 382 | S.OILR oil refinery a facility for converting crude oil into refined petroleum products |
| 383 | 383 | S.OILT tank farm a tract of land occupied by large, cylindrical, metal tanks in which oil or liquid petrochemicals are stored |
| 384 | 384 | S.OILW oil well a well from which oil may be pumped |
| — | — | @@ -389,12 +389,12 @@ |
| 390 | 390 | S.PMPW water pumping station a facility for pumping water from a major well or through a pipeline |
| 391 | 391 | S.PO post office a public building in which mail is received, sorted and distributed |
| 392 | 392 | S.PP police post a building in which police are stationed |
| 393 | | -S.PP.Q abandoned police post |
| | 393 | +S.PP.Q abandoned police post |
| 394 | 394 | S.PRKGT park gate a controlled access to a park |
| 395 | 395 | S.PRKHQ park headquarters a park administrative facility |
| 396 | 396 | S.PRN prison a facility for confining prisoners |
| 397 | 397 | S.PRN.J reformatory a facility for confining, training, and reforming young law offenders |
| 398 | | -S.PRN.Q abandoned prison |
| | 398 | +S.PRN.Q abandoned prison |
| 399 | 399 | S.PS power station a facility for generating electric power |
| 400 | 400 | S.PS.H hydroelectric power station a building where electricity is generated from water power |
| 401 | 401 | S.PSTB border post a post or station at an international boundary for the regulation of movement of people and goods |
| — | — | @@ -414,9 +414,9 @@ |
| 415 | 415 | S.RSGNL railroad signal a signal at the entrance of a particular section of track governing the movement of trains |
| 416 | 416 | S.RSRT resort a specialized facility for vacation, health, or participation sports activities |
| 417 | 417 | S.RSTN railroad station a facility comprising ticket office, platforms, etc. for loading and unloading train passengers and freight |
| 418 | | -S.RSTN.Q abandoned railroad station |
| | 418 | +S.RSTN.Q abandoned railroad station |
| 419 | 419 | S.RSTP railroad stop a place lacking station facilities where trains stop to pick up and unload passengers and freight |
| 420 | | -S.RSTP.Q abandoned railroad stop |
| | 420 | +S.RSTP.Q abandoned railroad stop |
| 421 | 421 | S.RUIN ruin(s) a destroyed or decayed structure which is no longer functional |
| 422 | 422 | S.SCH school building(s) where instruction in one or more branches of knowledge takes place |
| 423 | 423 | S.SCH.A agricultural school a school with a curriculum focused on agriculture |
| — | — | @@ -505,7 +505,7 @@ |
| 506 | 506 | T.ISL.M mangrove island a mangrove swamp surrounded by a waterbody |
| 507 | 507 | T.ISL.S islands tracts of land, smaller than a continent, surrounded by water at high water |
| 508 | 508 | T.ISL.T land-tied island a coastal island connected to the mainland by barrier beaches, levees or dikes |
| 509 | | -T.ISL.X section of island |
| | 509 | +T.ISL.X section of island |
| 510 | 510 | T.ISTH isthmus a narrow strip of land connecting two larger land masses and bordered by water |
| 511 | 511 | T.KRST karst area a distinctive landscape developed on soluble rock such as limestone characterized by sinkholes, caves, disappearing streams, and underground drainage |
| 512 | 512 | T.LAVA lava area an area of solidified lava |
| — | — | @@ -522,14 +522,14 @@ |
| 523 | 523 | T.PAN.S pans a near-level shallow, natural depression or basin, usually containing an intermittent lake, pond, or pool |
| 524 | 524 | T.PASS pass a break in a mountain range or other high obstruction, used for transportation from one side to the other [See also gap] |
| 525 | 525 | T.PEN peninsula an elongate area of land projecting into a body of water and nearly surrounded by water |
| 526 | | -T.PEN.X section of peninsula |
| | 526 | +T.PEN.X section of peninsula |
| 527 | 527 | T.PK peak a pointed elevation atop a mountain, ridge, or other hypsographic feature |
| 528 | 528 | T.PKS peaks pointed elevations atop a mountain, ridge, or other hypsographic features |
| 529 | 529 | T.PLAT plateau an elevated plain with steep slopes on one or more sides, and often with incised streams |
| 530 | | -T.PLAT.X section of plateau |
| | 530 | +T.PLAT.X section of plateau |
| 531 | 531 | T.PLDR polder an area reclaimed from the sea by diking and draining |
| 532 | 532 | T.PLN plain(s) an extensive area of comparatively level to gently undulating land, lacking surface irregularities, and usually adjacent to a higher area |
| 533 | | -T.PLN.X section of plain |
| | 533 | +T.PLN.X section of plain |
| 534 | 534 | T.PROM promontory(-ies) a bluff or prominent hill overlooking or projecting into a lowland |
| 535 | 535 | T.PT point a tapering piece of land projecting into a body of water, less prominent than a cape |
| 536 | 536 | T.PT.S points tapering pieces of land projecting into a body of water, less prominent than a cape |
| — | — | @@ -556,7 +556,7 @@ |
| 557 | 557 | T.VAL valley an elongated depression usually traversed by a stream |
| 558 | 558 | T.VAL.G hanging valley a valley the floor of which is notably higher than the valley or shore to which it leads; most common in areas that have been glaciated |
| 559 | 559 | T.VAL.S valleys elongated depressions usually traversed by a stream |
| 560 | | -T.VAL.X section of valley |
| | 560 | +T.VAL.X section of valley |
| 561 | 561 | T.VLC volcano a conical elevation composed of volcanic materials with a crater at the top |
| 562 | 562 | U.APNU apron a gentle slope, with a generally smooth surface, particularly found around groups of islands and seamounts |
| 563 | 563 | U.ARCU arch a low bulge around the southeastern end of the island of Hawaii |
| — | — | @@ -647,4 +647,4 @@ |
| 648 | 648 | V.TUND tundra a marshy, treeless, high latitude plain, dominated by mosses, lichens, and low shrub vegetation under permafrost conditions |
| 649 | 649 | V.VIN vineyard a planting of grapevines |
| 650 | 650 | V.VIN.S vineyards plantings of grapevines |
| 651 | | -null not available |
| | 651 | +null not available |