Skip to content

Commit

Permalink
closes: #372
Browse files Browse the repository at this point in the history
  • Loading branch information
@Raruto
Raruto committed May 3, 2024
1 parent ab808dd commit 9093bbc
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion g3w-admin/client/api/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ def get(
"rasterurl": settings.RASTER_URL,
"proxyurl": reverse("interface-proxy"),
"interfaceowsurl": reverse("interface-ows"),
"group": groupSerializer.data,
"g3wsuite_logo_img": settings.CLIENT_G3WSUITE_LOGO,
"credits": reverse("client-credits"),
"main_map_title": generaldata.main_map_title,
"i18n": settings.LANGUAGES,
**groupSerializer.data,
}

# add frontendurl if frontend is set
Expand Down
44 changes: 22 additions & 22 deletions g3w-admin/client/tests/test_api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,39 +127,39 @@ def testGroupConfigApiView(self):
response = self._testApiCall('group-map-config', ['gruppo-1', 'qdjango', '1'])
resp = json.loads(response.content)
self.assertEqual(resp["vectorurl"], "/vector/api/")
self.assertEqual(resp["group"]["crs"], {
self.assertEqual(resp["crs"], {
'epsg': 4326,
'proj4': '+proj=longlat +datum=WGS84 +no_defs',
'geographic': True,
'axisinverted': True,
'extent': [-180.0, -90.0, 180.0, 90.0]
})
print(resp["group"]["mapcontrols"])
self.assertEqual(resp["group"]["mapcontrols"], {'zoom': {}, 'zoombox': {}, 'zoomtoextent': {}, 'query': {}, 'querybbox': {}, 'querybypolygon': {}, 'overview': {}, 'scaleline': {}, 'geolocation': {}, 'streetview': {}, 'geocoding': {'providers': {}}, 'addlayers': {}, 'length': {}, 'area': {}, 'mouseposition': {}, 'scale': {}})
self.assertEqual(resp["group"]["header_logo_img"], "logo_img/qgis-logo.png")
self.assertEqual(resp["group"]["name"], "Gruppo 1")
self.assertIsNone(resp["group"]["header_logo_link"])
self.assertEqual(resp["group"]["initproject"], "qdjango:1")
self.assertEqual(resp["group"]["header_terms_of_use_link"], "")
self.assertTrue(resp["group"]["powered_by"])
self.assertEqual(resp["group"]["baselayers"], [{'crs': {'epsg': 3857, 'proj4': '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', 'geographic': False, 'axisinverted': False}, 'servertype': 'OSM', 'attribution': "<a href='https://www.openstreetmap.org/copyright'>OpenStreetMap contributors</a>", 'name': 'OpenStreetMap', 'title': 'OSM', 'scalebasedvisibility': False, 'maxscale': 0, 'minscale': 100000000, 'id': 3, 'icon': None}])
self.assertEqual(resp["group"]["header_terms_of_use_text"], "")
self.assertEqual(resp["group"]["header_custom_links"], [])
self.assertEqual(resp["group"]["background_color"], "#ffffff")
self.assertEqual(resp["group"]["id"], 1)
self.assertEqual(resp["group"]["slug"], 'gruppo-1')
self.assertEqual(len(resp["group"]["projects"]), 1)

self.assertIn('vendorkeys', resp["group"])
self.assertEqual(resp["group"]["vendorkeys"], {'google': '123456789'})

project = resp["group"]["projects"][0]
print(resp["mapcontrols"])
self.assertEqual(resp["mapcontrols"], {'zoom': {}, 'zoombox': {}, 'zoomtoextent': {}, 'query': {}, 'querybbox': {}, 'querybypolygon': {}, 'overview': {}, 'scaleline': {}, 'geolocation': {}, 'streetview': {}, 'geocoding': {'providers': {}}, 'addlayers': {}, 'length': {}, 'area': {}, 'mouseposition': {}, 'scale': {}})
self.assertEqual(resp["header_logo_img"], "logo_img/qgis-logo.png")
self.assertEqual(resp["name"], "Gruppo 1")
self.assertIsNone(resp["header_logo_link"])
self.assertEqual(resp["initproject"], "qdjango:1")
self.assertEqual(resp["header_terms_of_use_link"], "")
self.assertTrue(resp["powered_by"])
self.assertEqual(resp["baselayers"], [{'crs': {'epsg': 3857, 'proj4': '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs', 'geographic': False, 'axisinverted': False}, 'servertype': 'OSM', 'attribution': "<a href='https://www.openstreetmap.org/copyright'>OpenStreetMap contributors</a>", 'name': 'OpenStreetMap', 'title': 'OSM', 'scalebasedvisibility': False, 'maxscale': 0, 'minscale': 100000000, 'id': 3, 'icon': None}])
self.assertEqual(resp["header_terms_of_use_text"], "")
self.assertEqual(resp["header_custom_links"], [])
self.assertEqual(resp["background_color"], "#ffffff")
self.assertEqual(resp["id"], 1)
self.assertEqual(resp["slug"], 'gruppo-1')
self.assertEqual(len(resp["projects"]), 1)

self.assertIn('vendorkeys', resp)
self.assertEqual(resp["vendorkeys"], {'google': '123456789'})

project = resp["projects"][0]
to_compare = {'description': '<p>progetto 1<br></p>', 'title': 'Un progetto',
'thumbnail': '/fake/project.png', 'gid': 'qdjango:1', 'type': 'qdjango', 'id': 1}
for k in list(to_compare.keys()):
self.assertEqual(project[k], to_compare[k])

self.assertIsNone(resp["group"]["overviewproject"])
self.assertIsNone(resp["overviewproject"])
self.assertIsNone(resp["main_map_title"])
self.assertEqual(resp["mediaurl"], "/media/")
self.assertFalse(resp["baseurl"].startswith('/'), 'baseurl is not an absolute URI')
Expand Down
3 changes: 2 additions & 1 deletion g3w-admin/client/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ def get_context_data(self, **kwargs):
'admin_url': reverse('home')
} if (u in get_users_for_object(self.project, "change_project", with_group_users=True) or u.is_superuser) and reverse('home') else {})
},
"group": deepcopy(groupSerializer.data),
"baseurl": baseurl,
"vectorurl": settings.VECTOR_URL,
"proxyurl": reverse('interface-proxy'),
Expand All @@ -156,6 +155,8 @@ def get_context_data(self, **kwargs):
"credits": reverse('client-credits'),
"version": get_version(),
"frontendurl": baseurl if settings.FRONTEND else '',
# project data
**deepcopy(groupSerializer.data)
}).decode('UTF-8') + ';'

# project by type(app)
Expand Down

0 comments on commit 9093bbc

Please sign in to comment.