From 69c317cd1fa5f531eed9de9d41f78970dbd5233a Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 23 Mar 2016 11:14:30 +0100
Subject: [PATCH] Fix some comments and error messages referencing raster
 parameters

---
 plugins/input/pgraster/pgraster_datasource.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/input/pgraster/pgraster_datasource.cpp b/plugins/input/pgraster/pgraster_datasource.cpp
index d6c9a5e3b..f3191e8e4 100644
--- a/plugins/input/pgraster/pgraster_datasource.cpp
+++ b/plugins/input/pgraster/pgraster_datasource.cpp
@@ -172,7 +172,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
                 (raster_table_, parsed_schema_, parsed_table_);
         }
 
-        // If we do not know either the geometry_field or the srid or we
+        // If we do not know either the raster_field or the srid or we
         // want to use overviews but do not know about schema, or
         // no extent was specified, then attempt to fetch the missing
         // information from a raster_columns entry.
@@ -180,7 +180,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
         // This will return no records if we are querying a bogus table returned
         // from the simplistic table parsing in table_from_sql() or if
         // the table parameter references a table, view, or subselect not
-        // registered in the geometry columns.
+        // registered in the raster_columns.
         //
         geometryColumn_ = mapnik::sql_utils::unquote_copy('"', raster_field_);
         if (!parsed_table_.empty() && (
@@ -265,7 +265,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
 
             // If we still do not know the srid then we can try to fetch
             // it from the 'table_' parameter, which should work even if it is
-            // a subselect as long as we know the geometry_field to query
+            // a subselect as long as we know the raster_field to query
             if (! geometryColumn_.empty() && srid_ <= 0)
             {
                 s.str("");
@@ -443,7 +443,7 @@ pgraster_datasource::pgraster_datasource(parameters const& params)
             MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Table " << table_ << " is using SRID=" << srid_;
         }
 
-        // At this point the geometry_field may still not be known
+        // At this point the raster_field may still not be known
         // but we'll catch that where more useful...
         MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Using SRID=" << srid_;
         MAPNIK_LOG_DEBUG(pgraster) << "pgraster_datasource: Using geometry_column=" << geometryColumn_;
@@ -835,7 +835,7 @@ featureset_ptr pgraster_datasource::features_with_context(query const& q,process
                 s_error << parsed_schema_ << ".";
             }
             s_error << parsed_table_
-                    << "'. Please manually provide the 'geometry_field' parameter or add an entry "
+                    << "'. Please manually provide the 'raster_field' parameter or add an entry "
                     << "in the geometry_columns for '";
 
             if (!parsed_schema_.empty())
@@ -998,7 +998,7 @@ featureset_ptr pgraster_datasource::features_at_point(coord2d const& pt, double
                     s_error << parsed_schema_ << ".";
                 }
                 s_error << parsed_table_
-                        << "'. Please manually provide the 'geometry_field' parameter or add an entry "
+                        << "'. Please manually provide the 'raster_field' parameter or add an entry "
                         << "in the geometry_columns for '";
 
                 if (!parsed_schema_.empty())