refactor ogcproxy + test for ogcproxy