From 5816161a40f24446c1cebfe2c2158d6a2e5a3d8c Mon Sep 17 00:00:00 2001
From: Oliver Tonnhofer <olt@bogosoft.com>
Date: Fri, 24 Nov 2017 11:36:23 +0100
Subject: [PATCH] docs: change pseudoarea to webmerc_area in test/example
 configurations

---
 database/postgis/test_mapping.json | 2 +-
 docs/mapping.rst                   | 7 +------
 example-mapping.json               | 4 ++--
 example-mapping.yml                | 4 ++--
 mapping/columns.go                 | 2 +-
 mapping/test_mapping.json          | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/database/postgis/test_mapping.json b/database/postgis/test_mapping.json
index b35c48c..c76067f 100644
--- a/database/postgis/test_mapping.json
+++ b/database/postgis/test_mapping.json
@@ -125,7 +125,7 @@
                     "key": null
                 },
                 {
-                    "type": "pseudoarea",
+                    "type": "webmerc_area",
                     "name": "area",
                     "key": null
                 }
diff --git a/docs/mapping.rst b/docs/mapping.rst
index 92e97cd..21dc5d9 100644
--- a/docs/mapping.rst
+++ b/docs/mapping.rst
@@ -299,15 +299,10 @@ The geometry of the OSM element.
 Like `geometry`, but the geometries will be validated and repaired when this table is used as a source for a generalized table. Must only be used for `polygon` tables.
 
 
-``pseudoarea``
-^^^^^^^^^^^^^^
-
-Area of polygon geometries in square meters. This area is calculated in the webmercator projection, so it is only accurate at the equator and gets off the more the geometry moves to the poles. It's still good enough to sort features by area for rendering purposes.
-
 ``area``
 ^^^^^^^^
 
-Area of polygon geometries in the unit of the selected projection (m² or degrees²). Note that a `meter` in the webmercator projection is only accurate at the equator and gets off the more the geometry moves to the poles. It's still good enough to sort features by area for rendering purposes.
+Area of polygon geometries in the unit of the selected projection (m² or degrees²). Note that the area is only accurate at the equator for EPSG:4326 and EPSG:3857 and gets off the more the geometry moves to the poles. It's still good enough to sort features by area for rendering purposes.
 
 ``webmerc_area``
 ^^^^^^^^^^^^^^^^
diff --git a/example-mapping.json b/example-mapping.json
index f592cd4..5319538 100644
--- a/example-mapping.json
+++ b/example-mapping.json
@@ -78,7 +78,7 @@
                     "key": null
                 },
                 {
-                    "type": "pseudoarea",
+                    "type": "webmerc_area",
                     "name": "area",
                     "key": null
                 },
@@ -861,7 +861,7 @@
                     "key": null
                 },
                 {
-                    "type": "pseudoarea",
+                    "type": "webmerc_area",
                     "name": "area",
                     "key": null
                 }
diff --git a/example-mapping.yml b/example-mapping.yml
index b900435..5409415 100644
--- a/example-mapping.yml
+++ b/example-mapping.yml
@@ -227,7 +227,7 @@ tables:
     - name: type
       type: mapping_value
     - name: area
-      type: pseudoarea
+      type: webmerc_area
     - args:
         values:
         - land
@@ -530,7 +530,7 @@ tables:
     - name: type
       type: mapping_value
     - name: area
-      type: pseudoarea
+      type: webmerc_area
     mapping:
       amenity:
       - swimming_pool
diff --git a/mapping/columns.go b/mapping/columns.go
index f6b7ace..1a95ec9 100644
--- a/mapping/columns.go
+++ b/mapping/columns.go
@@ -135,7 +135,7 @@ func Geometry(val string, elem *element.OSMElem, geom *geom.Geometry, match Matc
 }
 
 func MakePseudoArea(columnName string, columnType ColumnType, column config.Column) (MakeValue, error) {
-	log.Print("warn: pseudoarea type is deprecated and will be removed. See area and webmercarea type.")
+	log.Print("warn: pseudoarea type is deprecated and will be removed. See area and webmerc_area type.")
 	return Area, nil
 }
 
diff --git a/mapping/test_mapping.json b/mapping/test_mapping.json
index 2962dfb..c3f8205 100644
--- a/mapping/test_mapping.json
+++ b/mapping/test_mapping.json
@@ -65,7 +65,7 @@
                     "key": null
                 },
                 {
-                    "type": "pseudoarea",
+                    "type": "webmerc_area",
                     "name": "area",
                     "key": null
                 },