diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4290ee8..e6dab15 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import { RouterModule ,UrlSegment} from '@angular/router'; import { AuthGuard,FullScreenGuard } from '@farmmaps/common'; import { MapComponent } from '@farmmaps/common-map'; @@ -7,12 +7,26 @@ import { LogoComponent } from './logo/logo.component'; import { MenuComponent } from './menu/menu.component'; import {NotImplementedComponent} from '@farmmaps/common'; +export function urlMatcher(url: UrlSegment[]) { + return {consumed:url}; +} + const routes = [ + { + path: '', + component: LogoComponent, + outlet: 'side-panel-logo' + }, + { + path: '', + component: MenuComponent, + outlet: 'side-panel-menu' + }, { path: '', redirectTo: 'map', pathMatch: 'full' - }, + }, { path:'editor/:type/item/:itemcode', component: NotImplementedComponent @@ -28,21 +42,9 @@ const routes = [ }, { path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', - component: MapComponent, - children:[ - { - path: '', - component: LogoComponent, - outlet: 'side-panel-logo' - }, - { - path: '', - component: MenuComponent, - outlet: 'side-panel-menu' - } - ] - } - ]}, + component: MapComponent + } + ]} ]; @NgModule({