Merge branch 'release/v0.4.2' of https://github.com/openego/data_processing into release/v0.4.2

Author: ulfmueller

dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql

@@ -45,7 +45,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS
 	SELECT 
 	  version,
           preversion,
-	  gid,
+	  id,
 	  bnetza_id,
 	  company,
 	  name,

preprocessing/sql_snippets/ego_dp_preprocessing_conv_powerplant.sql

@@ -176,7 +176,7 @@ SELECT obj_description('model_draft.ego_dp_supply_conv_powerplant'::regclass)::j
 INSERT INTO model_draft.ego_dp_supply_conv_powerplant
 	SELECT 
 	  'v0.3.0'::text  as preversion,
-	  gid as id,
+	  id,
 	  bnetza_id,
 	  company,
 	  name,
@@ -237,11 +237,11 @@ UPDATE model_draft.ego_dp_supply_conv_powerplant
 -- Correct an invalid geom in the register
 UPDATE model_draft.ego_dp_supply_conv_powerplant
 	SET lat = 48.0261021
-	WHERE gid = 493;
+	WHERE id = 493;
 
 UPDATE  model_draft.ego_dp_supply_conv_powerplant
 	set geom = ST_SetSRID(ST_MakePoint(lon,lat),4326)
-	WHERE gid = 493;
+	WHERE id = 493;
 
 
 -- Update Voltage Level of Power Plants according to allocation table

preprocessing/sql_snippets/supply/ego_dp_supply_metadata.sql

@@ -147,7 +147,7 @@ COMMENT ON TABLE supply.ego_dp_conv_powerplant
 		"format": "PostgreSQL",
 		"fields": [
 				{"name": "version", "description": "version number of eGo data processing", "unit": "" },
-				{"name": "gid", "description": "Unique identifier", "unit": "" },
+				{"name": "id", "description": "Unique identifier", "unit": "" },
 				{"name": "bnetza_id", "description": "Bundesnetzagentur unit ID", "unit": " " },			
 				{"name": "company", "description": "Name of company", "unit": " " },				
 				{"name": "name", "description": "name of unit ", "unit": " " },