Merge pull request #16 from hmakelin/hmakelin-wms-url

Update default WMS client settings

Author: hmakelin

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2021 Harri Mäkelin
+Copyright (c) 2022 Harri Mäkelin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

config/test_typhoon_h480__ksql_airport.yaml

@@ -3,9 +3,9 @@
 mock_gps_node:
   ros__parameters:
     wms:
-      url: 'http://localhost:8080/wms'
+      url: 'http://localhost:80/wms'
       #version: '1.1.1'
-      layers: ['Imagery']
+      layers: ['imagery']
       styles: ['']
       srs: 'EPSG:4326'
       image_format: 'image/jpeg'

config/typhoon_h480__ksql_airport.yaml

@@ -1,9 +1,9 @@
 mock_gps_node:
   ros__parameters:
     wms:
-      url: 'http://localhost:80/?map=/etc/mapserver/wms.map'
+      url: 'http://localhost:80/wms'
       version: '1.3.0'
-      layers: ['naip-natural-color-raster']
+      layers: ['imagery']
       styles: ['']
       srs: 'EPSG:4326'
       image_format: 'image/jpeg'

gisnav/nodes/base_node.py

@@ -47,13 +47,13 @@ class BaseNode(Node, ABC):
     _MATCHER_PROCESS_COUNT = 1  # should be 1
 
     # region ROS Parameter Defaults
-    ROS_D_WMS_URL = 'http://localhost:8080/wms'
+    ROS_D_WMS_URL = 'http://localhost:80/wms'
     """Default WMS server endpoint URL"""
 
-    ROS_D_WMS_VERSION = '1.1.1'
+    ROS_D_WMS_VERSION = '1.3.0'
     """Default WMS server version"""
 
-    ROS_D_WMS_LAYERS = ['Imagery']
+    ROS_D_WMS_LAYERS = ['imagery']
     """Default WMS request layers parameter
 
     .. note::

package.xml

@@ -3,7 +3,7 @@
 <package format="3">
   <name>gisnav</name>
   <version>0.60.1</version>
-  <description>Estimates airborne drone position by matching video to map retrieved from OGC WMS endpoint in PX4 SITL.</description>
+  <description>Estimates airborne drone global position by matching video to map retrieved from onboard GIS server.</description>
   <author email="hmakelin@protonmail.com">Harri Makelin</author>
   <maintainer email="hmakelin@protonmail.com">Harri Makelin</maintainer>
   <license>MIT</license>