thasleem
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1196 from lasanthaDLPDS/master

Browse Source 
Formatting device-location API
revert-70aa11f8
Madawa Soysa 7 years ago committed by GitHub
parent 22929c3886 175c987b8a
commit de9480e721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java
Unescape View File

@ -156,7 +156,7 @@ public interface GeoLocationBasedService {
* Get data to show device locations in a map * Get data to show device locations in a map
*/ */
@GET @GET
@Path("stats/deviceLocations") @Path("stats/device-locations")
@ApiOperation( @ApiOperation(
consumes = "application/json", consumes = "application/json",
produces = "application/json", produces = "application/json",

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
Unescape View File

@ -120,7 +120,7 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
} }
} }
@Path("stats/deviceLocations") @Path("stats/device-locations")
@GET @GET
@Consumes("application/json") @Consumes("application/json")
@Produces("application/json") @Produces("application/json")

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/public/js/app.js
Unescape View File

@ -99,7 +99,7 @@ var showMarkersOnChange=function(){
var minLat = bounds._southWest.lat; var minLat = bounds._southWest.lat;
var minLong = bounds._southWest.lng; var minLong = bounds._southWest.lng;
var zoom = map.getZoom(); var zoom = map.getZoom();
var backEndUrl = '/api/device-mgt/v1.0/geo-services/1.0.0/stats/deviceLocations'+ var backEndUrl = '/api/device-mgt/v1.0/geo-services/1.0.0/stats/device-locations'+
'?'+'&minLat='+minLat+'&maxLat='+maxLat+'&minLong='+minLong+ '?'+'&minLat='+minLat+'&maxLat='+maxLat+'&minLong='+minLong+
'&maxLong='+maxLong+'&zoom='+zoom; '&maxLong='+maxLong+'&zoom='+zoom;
markersLayer.clearLayers(); markersLayer.clearLayers();

2
components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java
Unescape View File

@ -156,7 +156,7 @@ public interface GeoLocationBasedService {
* Get data to show device locations in a map * Get data to show device locations in a map
*/ */
@GET @GET
@Path("stats/deviceLocations") @Path("stats/device-locations")
@ApiOperation( @ApiOperation(
consumes = "application/json", consumes = "application/json",
produces = "application/json", produces = "application/json",

2
components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
Unescape View File

@ -120,7 +120,7 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
} }
} }
@Path("stats/deviceLocations") @Path("stats/device-locations")
@GET @GET
@Consumes("application/json") @Consumes("application/json")
@Produces("application/json") @Produces("application/json")

Write Preview
Loading…
Cancel
Save