No need to pass params which are referenced in osmObject

Author: systemed

src/shared_data.cpp

@@ -32,13 +32,9 @@ class SharedData
 	}
 
 	// ----	Read all config details from JSON file
-	//     	TODO: should be able to get cachedGeometryNames and indices from osmObject,
-	//     	      rather than needing them to be passed as parameters
 
 	void readConfig(rapidjson::Document &jsonConfig, bool hasClippingBox, Box &clippingBox,
-	                map< uint, vector<OutputObject> > &tileIndex,
-	                map< uint, string > &cachedGeometryNames,
-	                map< string, RTree > &indices) {
+	                map< uint, vector<OutputObject> > &tileIndex) {
 		baseZoom       = jsonConfig["settings"]["basezoom"].GetUint();
 		startZoom      = jsonConfig["settings"]["minzoom" ].GetUint();
 		endZoom        = jsonConfig["settings"]["maxzoom" ].GetUint();
@@ -108,11 +104,11 @@ class SharedData
 				}
 				bool indexed=false; if (it->value.HasMember("index")) {
 					indexed=it->value["index"].GetBool();
-					indices[layerName]=RTree();
+					osmObject.indices->operator[](layerName)=RTree();
 				}
 				string indexName = it->value.HasMember("index_column") ? it->value["index_column"].GetString() : "";
 				readShapefile(it->value["source"].GetString(), sourceColumns, clippingBox, tileIndex,
-				              cachedGeometries, cachedGeometryNames, baseZoom, layerNum, layerName, indexed, indices, indexName);
+				              cachedGeometries, *osmObject.cachedGeometryNames, baseZoom, layerNum, layerName, indexed, *osmObject.indices, indexName);
 			}
 		}
 	}

src/tilemaker.cpp

@@ -403,7 +403,7 @@ int main(int argc, char* argv[]) {
 		if (jsonConfig.HasParseError()) { cerr << "Invalid JSON file." << endl; return -1; }
 		fclose(fp);
 
-		sharedData.readConfig(jsonConfig, hasClippingBox, clippingBox, tileIndex, cachedGeometryNames, indices);
+		sharedData.readConfig(jsonConfig, hasClippingBox, clippingBox, tileIndex);
 
 	} catch (...) {
 		cerr << "Couldn't find expected details in JSON file." << endl;