GeoAPI

Review & Revise with respect Catalog 2.0