From a4395a1da139133059833fb1f909f5033676f8bc Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 29 Mar 2017 19:31:14 +0300
Subject: [PATCH] Some fixes to district stuff

refs #6958

Change-Id: I55cd490238b75fede3e0b90dcf720cb28c23433f
---
 .../src/org/simantics/maps/sg/MapNode.java    |   2 +-
 .../graph.tg                                  | Bin 11188 -> 11300 bytes
 .../graph/DistrictNetwork.pgraph              |   3 +++
 .../graph/images/map.png                      | Bin 0 -> 804 bytes
 .../ontology/DistrictNetworkResource.java     |   6 ++++++
 .../fragment.e4xmi                            |   2 +-
 .../icons/map.png                             | Bin 0 -> 804 bytes
 .../icons/map_go.png                          | Bin 0 -> 842 bytes
 .../network/ui/function/Functions.java        |  10 +++++++---
 org.simantics.district.ui.feature/feature.xml |   7 +++++++
 10 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 org.simantics.district.network.ontology/graph/images/map.png
 create mode 100644 org.simantics.district.network.ui/icons/map.png
 create mode 100644 org.simantics.district.network.ui/icons/map_go.png

diff --git a/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java b/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java
index 01eab3a3..e06adcb2 100644
--- a/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java
+++ b/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java
@@ -169,7 +169,7 @@ public class MapNode extends G2DNode implements ITileListener  {
 
     public void init() {
         try {
-            ITileProvider provider = new OSMTileProvider(new WebService("http://localhost:8080/osm-bright/"), TILE_PIXEL_SIZE);
+            ITileProvider provider = new OSMTileProvider(new WebService("http://localhost:8080/mapbox-studio-osm-bright.tm2/"), TILE_PIXEL_SIZE);
 
             // Try to load eclipse specific implementation of TileJobQueue, if it doesn't exist, fall back to pojo implementation 
             try {
diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg
index c1cb1b6d1c219e7161f7bd853ee81def90644e73..317d8ce0641b5e4731d36d472db40508ab67870f 100644
GIT binary patch
literal 11300
zcmeI2iE~`lmBzI%EwwD!mg5Z&0z80?tj&uc#K@K`x3MK5wPh#9*iYThazpEN(~D&#
z40Z?sn>c_W>}!~WtdPV>SdvM+u$e6o3<(gjkg80krlwMvnwhFh)yy#8ciuhft7lK<
zADFH>dhd76x#ym{zSpf=K9+IPyNZg6iXlan{9``l;f$M2<ufsNO)Br@N~jLGdvdOq
zO{BbRHMxR+YWXLWh`U}ckxRJQDzY7^q)H?CLE`Stga_A@S3_6xDJvUFrE=5Cm3hv%
zD|M9RCe!|1RWDM=cusPfXGPk{pni#8C{;C(W-Y#Nc~!(Klq?Trb5713M<G99DO$1H
zN#_6W7L<#dv>VC)-ZbDR+7fi8^k&1v#6(LrG47yaV%e5dW(*$HG!@Spc9U+5$&Do3
ziA|A<+FIJ6{|t@QbB1${7k4u8!AvUcX4t2zovaJfb+msbygHMb$YNN~o;^8e$|Yv)
z##G!*CcH5OYlk*XZF!?=gN43Bb2^MDI}>C1jKgH0iAkwh>zu3>jJo6LB>D=*ePXQb
zcPG}Q#?z^6LbNwfyRQyKdfc5(KAG#sutD`}>Tjrwc)Q(<r2koQtcT-N@hHX>UOOeQ
zgh)7;lH*42ihf3qQ5G`Ei(#s9-O`tZ9;u+YILyvXrxISybjjaRT`@D3&*oC&XkTJy
z!p#ijlT6`yvCSJYlYWCU>Lvp&&x*^ekwiA{B+&*hmr0D~O~?I+#%F8LxPFX-$^XZq
ztc23k@;wRBfF3j{qhrTXnMssAET)--rdYwhPut-t#EFbMV@&r4qN#?)F96jKMa2x(
z6rw&grL@w@Qdx1zJjzj>t&L<OUM!i9yYUET#CJv8I8{@i-JcdS7MB#sqQEnvnS%nS
z@2N`Ki$l_qb~7@cr>?SU&>PbRmWfy0a4wUN<uE^!#?zs`ta@q&fkvrv8WSGYG}f9-
z<+XWF<^(Js(mZO-!!Jn)OnuB@4?BPvtSYLD8>THyQ)xR*Rkb~dESAFL2zLo6Iz&4g
z4ej;v<F3Dk#K>-VkJb*W+U4Tj!10+j0pa#8P0KCcR`Hzy-$0#bi(z)3>$#akY|z14
zaj~tLCX~=x9NOSax|vqw&P}D3x{|5^FPBQD#yHdJsHv?OOQuGhByN94uCr>ND@7`t
zY!=%OYzg7&9yjfJ@$3L+#WGP<S>3!{G-2JJwUfRe>T<=cf)%}dSTL6j!VQt^X4knU
zIXUEVtBFTbF#XbZMH_PiJHd|&S9VKQ?BTblc-+c+Ts&$bSv$;SewdzAepD9vSA=WP
zwSyTqo{0HdTeE1n!er$m@CVd1ThV*Or8MVoAODTOjNv?X=nRv__9<ER`hmJfv$>2D
zWA8mIni|YxY|h=8jKg-HCCcz{eso&trJ}CfkQmK4vMW3!3a&ogho{DzUGNUg4_Qgp
zh<_*|Ya!-JN`0a$jY{J60^Edkt6P)AKqJg=X{onjohPo9t5d0@>u}Jwh@!%83HSlw
z5O#!YBAd%fWk2<G=GiqVx@$yNZJq?8+9oPghW*dYAl9HLs<f5Rye%3&ilzpt@GP0-
zyGOiTSO+<#|Cng1{psO9%ziGa8X2S<o-|VP-}y>}?QwFBSvZe~vb@i{4XqKZz?+KS
zX-!jQv|Xt1peSdd^?1PLveA^x@y&@G-=}U9V^vRT+)4No<CCHZB~wm(ssk7KUK!Vk
z4|qw=i}$HnWDUZD;=*0s>Y86r`Jm<XG4U!htvMl77r_IWE7tX5{y5wu`f8@IdNSv-
z*TSMI_1p=-NdeA{fzhk+ep2Y}bH&2tG30pi0Qwa*=UORTEiQZ_`HhD8t5YgJ9#o}N
z71x+2`bF*Xs?twoX{Ax(evYr`P0AY@6thK9E*l##BFKs7`L9vXg-Y?Kcoz0cEVNjz
z-_1>=GS^@eY=wS=#t@Sm9*XvEiGp6FYQ$>5jp9=w4<L5U1o=jeZ{ZDTZ7La;>AFOm
z=Z|3I-8~zfbQ)`WYGs;X*dadC9#tt(`HzgaUwC_=mlyk1UvFNfOl+iboYuuw!dHqr
z7szlL8<3M6a(50-W^?X19ABdGO3V8U@viWL!`32Ptvfhdd=*tKjWK<>^LG(GQBz!^
z2gF<#^C!HS@6dOOzQH}sLvV$d7Gfds#c*10>B|)Ybcxq|<JB7<b4{x)pO1^rjB&rK
zEyFq*LeuBMe$iDH`tEir_J<>0I-iTWneha^6+rVc)wf%nbdUJeSSi5aJ}U2-vBCAm
za=W^7{#zek0N$YCKCAfs;@N<SEKg<I_f4Aaw|wsv-|*^0JdyDyv841fs_(V@?xtdY
zwPww6dY!7fEuTBZ=ae^^SE;_!^82FrVUwNefm=jVX1-t?5~>@>=cf15E7Tvd0^KT(
zwHj#9NpOPPA=>b?VTSrHs_&SI)x2AtlXkbfM%!Ih<O`?>&9z1#xU4pc#|#dx8=rcK
zL#g#*u(pxQsaPNOJqx=_QvCRWif>vOGb^oS=!u<g2)&+Jq=++9v{PG9Mlf7>UH89>
zT}yRl4)#-1AGQzsYeH0t@f*SLP^1UGFHjM+I$*W$5%F}h+a(HqIkM74p|zq9LvMWj
zXVvpmueAbREPk`iVhHx;rD6>sN@2A;N8P1Xhyih0&>fFUQqfdTziFQJP`W~#s(S~A
z`?hy>v@b`DMp2b<FhL7QjeL~p0s$YTa)DLXkd&!E&6YM#ET^oPBUI0`B1{^;z}Mux
zqOSBujLT>b6?^%0cB(m0oG)%One!=I@G;uXFH}`_0{kZAEXZ#lKZU#z;GYHf^#H#X
z;8!hX{8uby{Fej#Qh;9!@CyNcKETff_;`Si1^8%yj|7-Mgw%Y553Y|v$X|t=gd8yZ
z6<ptj9EAKm<VVK8(Xf_(*6@#w{d(}zkf#iP$M6pgf6wp_4DT`geZzdqVR?;z*l;th
zA3%0Po`k5K`I9w&zWS3j{}}F{fY|<I^^Y67?f>n7KUw`R!97|1`R?*9h#jA-{ws~$
z_Wx$UpRE4;LP)m#zY*{!tN)p}C#(NF+<zTn=R;Qig~qP_3&39s_><LtzOk!6<A2%m
ze;D_VTKov^?}zAmYchNdt`x3C+Rugj3bMuU1GxSYLi>FXyF6LTbM2Dt@?<Sf`@Imm
zJXy<gt&_F<d4{z-?e{=tL4FRo#jx60mUd;<Z8O_Oz729U<jw%!9bk>8{u)o2@mR)g
z4_Vv8y^5^uxz(`dNBdn6yF6LTzh>-Oev4r(PdnS7<r9Xr{Hunw{Fe-CdD`!Q*!@XX
zJ98mxds&ywK|9-e2%`Bk8P<GWF|7G~(XiG>`|S|BJXy=XZ0vS<+O<6G>|<@uR>PV<
zeQ8%_uFS#q=bTdh0`AF=L*9aLFFpX#^}8MS`yuMT)Uf8mva~C+E}NN)&CJhc=4Uhe
z-sU?4%>K9Soa;A3G+)l28!cwOWX*2^_n))u^xtbS{mJUT2ltbfJ!|;WxbnA~>kRXr
zy0qbE%=3iLF2>OO_8Gnb*Iz@J3+<mZ{yT8b9M%8xxZiCt^UXlCzPw@eXMVJQ*Tj3;
zu(sz~Fh%_b4L^kII}q-zv_A;>1>{jk3ZnCMJisTw9z^FaeaTltZi6%$*7<yfVU5T2
zoP;PdzRirk3!?F9Bir%Gc6_qNV|+f7wY>wlk3)8v{#kEW?Jjr+WEAot<SNJxh^~((
z0{o<5T^|mZWi;M)++PXNe3}evdtNfE`41V^@uK}x5RJ$2-yGl(upOVQ@%gSt*7z(>
z*7&q<f@u70xQ{~Ycw~+Dg0X8n_1Ac`4?{E_>tma=f41WO3d>F#nK>~RwvEg>8H>4*
z_5F*nIffdK^LHae^WA{^%LB|YR{wt7lQm!ZuCweB+^>abye7li{^t#A`}+)QJla=7
zv^?`6Yk$z6+-v3^@4GGgdAMI?G5hZm0lpNh@tbf@*7z42)_k8ctobQ7L;nGUu|E#c
z^2>04iN)=Pm*e^_gub+QK;DCNLRhEv@7abQ$Mr49w;^2+JN`<G8K122=}WfbuK?TS
zS*Oiy7Be1M<FPE+j@JU#@=I|~*8X8^n_1pw=4Uhe!)C61oB1rg2%`0E!Tl15-Ctzw
zuW#ahF~lBUvX-YWS;zOdVa;Dz$Cq_q2+{Ja{{o0zKUwSl7Vgi7*!7dOJblSp|1rZ_
zzp~cPy8i~E<vG94v6%UsX)*0*Ks29k7}oM1GpzZ~0WXB8o%_)Oi#Z?3n%_~wi*S7(
z(rsAR^JRv$eMb#zd$=|k&+ec3V6C6|&$F2IlePXMhP8h74eeULme=~#U+ZVz(ciA0
z&sgoRui@V2uN&6<*nhNZK5Prw?$4PP&&GWNM9Xu$W?0O8Ly&sNZz1$0*Fk;<p)Xm>
z*BaLPSr_ff%*AH5)n?8On>iP4=KQpIae%pgY&+Mg&D_gu=H6=a>Hx0|@VWr64=|rq
zc04}IY`!AELjjHkcqG7A26#t+cLg{ZU@yR_0A~U`8Q{GEzA?c2!Nm|AZ?>Il_@WB@
zDVk$`P;2skA#NJ?f6RyF6Joc1u>X`O>fCg8Y^nW=;)SB0t%3L}ofYP0vCd8KkVJOr
zwEx_+q`fgzv{^iEEA8tY=vy<qwRv;jaMQ}p<|W}!6FxoN(M=mgxxKBcpr&bfa9!`v
zK%}QoWO>Jmm2Dj>mb7=RY-wM%qP@Li+42q(h$Z;x-V|LoFcgV?a%(eN(Y&O2MQcZE
z^R{i4->E*!@#|^9XK*O8u@_nOWn9;rNW^wEFKPX&#aDK<wiSwR>W@UXHpksD6i3OH
z*0vR$%R1V-+LyI;b>Vl~m47u>S6h2~A=as>@`qm7(X-s@{LiKm|62bKxPDGLyiR^(
zwGV9!i(Y;$zS#U)e2%E*MzT$w|IfRo(ZD}P_$cu|3r!s|+qgsfpNT47IRkmAJuukc
z7Y@zmEDT51^>DRuC#$bwO=tb<M-DD0BN+8P@5dfI{7?T}S<!r~?96li`;w~;9y~F6
zu&MO;8Grc8fws$Xs}`58xwmL{>Byh<{@bC2_dGiHvRf~2t!;Yeye;8%|8nxh^vi#I
z<B@rLCMS<|R_%Lt;RDyV)_3lE=szl-d*jH$+JC&R{`F@bE<RFx;uhzoeeeEx?!I|N
zvyT3uJihV#E7qMT|4V0VS<#~6_M%7D&Mu8U^<N+D{o|{BH(gLW@nOq}y6B<{FWnd3
zckPMDp|09j{xe<r=C+bs#^SAGCpXQ$c2DPH4}>z+na<-!-~RWBRgc{q9x2_?ayHi6
z;rE`tF1h82^=MvEq_@B4$<;e<!0m47;80J0Q{kT>UzQ#d13b#YIJ1C%p7XyJ_=iS$
zlE<LRWj$5+7C1dxi9h=J|8s)c6Fg-z?WE)MbAo&{^TX{hT;%sDd3I5uXNyXUrVjue
zYKr_};Jx`2%M3s50mDX`ii3v%8>nrZIxiPI3^<eKhEom$`e(3CIYw7b@3K>lkIA9C
z^8fXq*bFIk+M{oBD6;JIN8jZ5Qnh{bO^$w4PdoZ1Cz`4QN8jY6izuz5Zzaqka6(E>
z8<fcZr3xoP<TO~x^n)}Z7A~<53Gv;Ot6`S;zQ^||a=l@`|B&kp^L>e2YdCB;WVps~
zmEme|DWt+M%ktChU+}j<mhLK?F15~@#?2v!7PFDIU^&a_ua>~^2t5OYK&vEBmG!SV
ICX3Gc9~WC4xc~qF

literal 11188
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
PzU8D=Yv3q@p4a&w8Dj$>

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 5c30822b..7719ed48 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -69,6 +69,9 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
+DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
+DN.MappedComponent <R L0.IsWeaklyRelatedTo
+
 DN.Diagram <T DIA.Diagram
 
 DN.AddLayerToDNDiagramTemplate <T L0.Template
diff --git a/org.simantics.district.network.ontology/graph/images/map.png b/org.simantics.district.network.ontology/graph/images/map.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90ef25ec7f1cb0fdae38d9fe2d9edeee9928ef1
GIT binary patch
literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!wn;=mR2Ufr
z!OM>mbpQb1@7I~O+ue5CWtZi#AZox@gcwb{Xkx^Rf;Ty8yn6DWhJV4kC*wg94<7Vt
zlteKm5+jKLV^qM1yt2HO4YZw^&a^Wfzb_m+@y40e_0^+M6ajz$03Zl}fU=sqfA9W}
z@#^~O(a%3QB{YI^J_A4y)M^1_vjjn1H`Mc5t@6>y50A!C6seTL>`UqQ7p$DgY@K|>
zQm^as<zHM(KXYqqsMlL|cY7#`n?`Bw-D9<89BBXyhuelvw~UfRcKUBga$AxlLUBPc
z8JlEd(@A17NtAgiggJsZ0Q&u%)H93k@8IL}+Hb8{-?LX|cEzMTq&MhkMGbMYCCPFj
z6bKqXFdPmg$=Jj7%4nrD`TAd~xjOsVtVm?z)U3!9d1_i@La0Fu(C@EP&kXv@hVMON
z<<o8DD|@up3Xe>;HM{#Qwj<3}(>R-AM4&+cd0t49%y2X`UaCBJg8YmB)K#uA{Z>9n
zOp8>WCg#&r06`o8oz6gaIn`fY2F<r0)%oD8xH@3(>R<BC#76fI?bep*<eI4Qj(|7-
z#=}&S6iEHHdB=@e!>)ssCr@3rc|5f%`bIJO$zbt__PK3gH51Sff`H}0ZWac9&q~*(
zO@qNscV0VSU%X<nwb!6KvT=Pu=Z8yfv?_J81!Ab{+PRxoUD&*&+wIBoT#}@cqVVfe
z4TrzFA~}EE=1SA;=N~s}2K!rW5C>#sYO9)Qx4M=(eR(m}UFhondELHSnO2hr&mMO3
zv6gmw!P2y#u0c!?LPO88NyxOTj>XWm>*77F&55fo9Z?)iynObdfA;SdwVRl$W~G3*
zEGt!2+1T-%ja32&!XdoMS_mM#IQK#{6D_nvjYu`GlvO3XdE)qYJJ;7<kD4)p00;m8
i2mpbytZd!gI{iPAYc`)5w~E350000<MNUMnLSTZ)EPw3)

literal 0
HcmV?d00001

diff --git a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
index 1e73de18..cdf31212 100644
--- a/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
+++ b/org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
@@ -21,6 +21,7 @@ public class DistrictNetworkResource {
     public final Resource Composite;
     public final Resource Connection;
     public final Resource Diagram;
+    public final Resource Diagram_MappedDiagram;
     public final Resource EPSG_4326;
     public final Resource Edge;
     public final Resource EdgeDefaultMapping;
@@ -53,6 +54,7 @@ public class DistrictNetworkResource {
     public final Resource Images_ConfigurationFolder;
     public final Resource InLayer;
     public final Resource Layer;
+    public final Resource MappedComponent;
     public final Resource Mapping;
     public final Resource MappingParameterType;
     public final Resource Mapping_Base;
@@ -94,6 +96,7 @@ public class DistrictNetworkResource {
         public static final String Composite = "http://www.simantics.org/DistrictNetwork-1.0/Composite";
         public static final String Connection = "http://www.simantics.org/DistrictNetwork-1.0/Connection";
         public static final String Diagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram";
+        public static final String Diagram_MappedDiagram = "http://www.simantics.org/DistrictNetwork-1.0/Diagram/MappedDiagram";
         public static final String EPSG_4326 = "http://www.simantics.org/DistrictNetwork-1.0/EPSG_4326";
         public static final String Edge = "http://www.simantics.org/DistrictNetwork-1.0/Edge";
         public static final String EdgeDefaultMapping = "http://www.simantics.org/DistrictNetwork-1.0/EdgeDefaultMapping";
@@ -126,6 +129,7 @@ public class DistrictNetworkResource {
         public static final String Images_ConfigurationFolder = "http://www.simantics.org/DistrictNetwork-1.0/Images/ConfigurationFolder";
         public static final String InLayer = "http://www.simantics.org/DistrictNetwork-1.0/InLayer";
         public static final String Layer = "http://www.simantics.org/DistrictNetwork-1.0/Layer";
+        public static final String MappedComponent = "http://www.simantics.org/DistrictNetwork-1.0/MappedComponent";
         public static final String Mapping = "http://www.simantics.org/DistrictNetwork-1.0/Mapping";
         public static final String MappingParameterType = "http://www.simantics.org/DistrictNetwork-1.0/MappingParameterType";
         public static final String Mapping_Base = "http://www.simantics.org/DistrictNetwork-1.0/Mapping/Base";
@@ -177,6 +181,7 @@ public class DistrictNetworkResource {
         Composite = getResourceOrNull(graph, URIs.Composite);
         Connection = getResourceOrNull(graph, URIs.Connection);
         Diagram = getResourceOrNull(graph, URIs.Diagram);
+        Diagram_MappedDiagram = getResourceOrNull(graph, URIs.Diagram_MappedDiagram);
         EPSG_4326 = getResourceOrNull(graph, URIs.EPSG_4326);
         Edge = getResourceOrNull(graph, URIs.Edge);
         EdgeDefaultMapping = getResourceOrNull(graph, URIs.EdgeDefaultMapping);
@@ -209,6 +214,7 @@ public class DistrictNetworkResource {
         Images_ConfigurationFolder = getResourceOrNull(graph, URIs.Images_ConfigurationFolder);
         InLayer = getResourceOrNull(graph, URIs.InLayer);
         Layer = getResourceOrNull(graph, URIs.Layer);
+        MappedComponent = getResourceOrNull(graph, URIs.MappedComponent);
         Mapping = getResourceOrNull(graph, URIs.Mapping);
         MappingParameterType = getResourceOrNull(graph, URIs.MappingParameterType);
         Mapping_Base = getResourceOrNull(graph, URIs.Mapping_Base);
diff --git a/org.simantics.district.network.ui/fragment.e4xmi b/org.simantics.district.network.ui/fragment.e4xmi
index e4a2fbcb..75ef8fa7 100644
--- a/org.simantics.district.network.ui/fragment.e4xmi
+++ b/org.simantics.district.network.ui/fragment.e4xmi
@@ -28,7 +28,7 @@
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_Rf7koN16Eea73Pr1j_7O0Q" featurename="trimContributions" parentElementId="xpath:/">
     <elements xsi:type="menu:TrimContribution" xmi:id="_c57iwN16Eea73Pr1j_7O0Q" elementId="org.simantics.district.network.ui.trimcontribution.0" parentId="org.eclipse.ui.main.toolbar">
       <children xsi:type="menu:ToolBar" xmi:id="_vdgLoN16Eea73Pr1j_7O0Q" elementId="org.simantics.district.network.ui.toolbar.0">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_v99NUN16Eea73Pr1j_7O0Q" elementId="org.simantics.district.network.ui.handledtoolitem.domapping" label="Do mapping" tooltip="testtsts" command="_zhiBwN16Eea73Pr1j_7O0Q"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_v99NUN16Eea73Pr1j_7O0Q" elementId="org.simantics.district.network.ui.handledtoolitem.domapping" label="Map network ontology" iconURI="platform:/plugin/org.simantics.district.network.ui/icons/map_go.png" tooltip="Map network ontology to simulator specific model" command="_zhiBwN16Eea73Pr1j_7O0Q"/>
       </children>
     </elements>
   </fragments>
diff --git a/org.simantics.district.network.ui/icons/map.png b/org.simantics.district.network.ui/icons/map.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90ef25ec7f1cb0fdae38d9fe2d9edeee9928ef1
GIT binary patch
literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!wn;=mR2Ufr
z!OM>mbpQb1@7I~O+ue5CWtZi#AZox@gcwb{Xkx^Rf;Ty8yn6DWhJV4kC*wg94<7Vt
zlteKm5+jKLV^qM1yt2HO4YZw^&a^Wfzb_m+@y40e_0^+M6ajz$03Zl}fU=sqfA9W}
z@#^~O(a%3QB{YI^J_A4y)M^1_vjjn1H`Mc5t@6>y50A!C6seTL>`UqQ7p$DgY@K|>
zQm^as<zHM(KXYqqsMlL|cY7#`n?`Bw-D9<89BBXyhuelvw~UfRcKUBga$AxlLUBPc
z8JlEd(@A17NtAgiggJsZ0Q&u%)H93k@8IL}+Hb8{-?LX|cEzMTq&MhkMGbMYCCPFj
z6bKqXFdPmg$=Jj7%4nrD`TAd~xjOsVtVm?z)U3!9d1_i@La0Fu(C@EP&kXv@hVMON
z<<o8DD|@up3Xe>;HM{#Qwj<3}(>R-AM4&+cd0t49%y2X`UaCBJg8YmB)K#uA{Z>9n
zOp8>WCg#&r06`o8oz6gaIn`fY2F<r0)%oD8xH@3(>R<BC#76fI?bep*<eI4Qj(|7-
z#=}&S6iEHHdB=@e!>)ssCr@3rc|5f%`bIJO$zbt__PK3gH51Sff`H}0ZWac9&q~*(
zO@qNscV0VSU%X<nwb!6KvT=Pu=Z8yfv?_J81!Ab{+PRxoUD&*&+wIBoT#}@cqVVfe
z4TrzFA~}EE=1SA;=N~s}2K!rW5C>#sYO9)Qx4M=(eR(m}UFhondELHSnO2hr&mMO3
zv6gmw!P2y#u0c!?LPO88NyxOTj>XWm>*77F&55fo9Z?)iynObdfA;SdwVRl$W~G3*
zEGt!2+1T-%ja32&!XdoMS_mM#IQK#{6D_nvjYu`GlvO3XdE)qYJJ;7<kD4)p00;m8
i2mpbytZd!gI{iPAYc`)5w~E350000<MNUMnLSTZ)EPw3)

literal 0
HcmV?d00001

diff --git a/org.simantics.district.network.ui/icons/map_go.png b/org.simantics.district.network.ui/icons/map_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..11eab26db5f74c7db82a3089a0926267b437dec2
GIT binary patch
literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!+(|@1R2Ufr
z!A*!%bpQbH-+w-K8Fyx9-Cei!YlA|;M36cpL<Le|retUbA&_pJx)h$ecZdk;A_XND
z5p@W{N+>0;GBGqrEGw;Tan07PX6DVCH*elYzhBsU=<(Atb2GcE)hYl8004pj2*~on
z?Z0oIsm;vI?0)<8cZ5oi6(axyL8%l#Jc<yMWkp$(O1T%0zOcJitybkSVf4QK7niI(
z9a}lNV4~G@_3F2N>c44urK8oFbZfPvTC3~!6G!%z>b0s0K&P{+vu#W_io~a`h@zXK
zC=!O33<o`fxF;P%27^eJ^o39$s0Bc~y^eBZ&GXZ|e9`#9S##?*XpF8IWLvbRTE?ms
zwfdMSPJ}Q-PyvEYrz47b{+r8n*JcJE{YG9W<FiJ?NZjii4P(QkFCE50C_xRN-JYWy
znQBk!Ja><^$5v$zuQxtBw2-c<H#b`|UR58f>%}R$1S$lOBt!iu*6DWiCUXC7B{^|j
znI|ggXHNdO-<Q|-=|}%4(!KzKN&qw(Q<{@A+U<F*<~sFfc4{ovH1a!bn7Lt?r#8)Q
zbMo2&+vnd>trP-k0nqF8MbQv_-{1JlsVf(hkEGJ?evxLG4bxj~o4;Q#>3iv`_q_Jh
zegQQh2$-Cj*Ug50h+}`Gby<;mbo&u`S;&iAp|sptvSZT&qIBTd5BAs*o>qghES+Ea
z-K85pYc^YwB#~sPyeurP{%TZYvSMVEk93DUJ2yWl8pX~I-c<{Tv%ZylWPGe?qS2NN
zQ%RP{^2{BR3$h}YmxY_1KTS91U0nLc<>f2x?H*7g2%(~7(jdgf^M*B{Db5nd&%Gio
zQc0G&dv?2BcRl99;@8eEp7ZL#6Fxrnsalrh@;tY3dZ&#u1Q6`n@+1f$fWyb`6Dkdt
zmoIzc@P{@|Ey(gugnfse_<Y^m?4D}9h9Cd}0N_mPxU?)i)IVfGOP1wUZmpd9A5RHp
UJmhaqTmS$707*qoM6N<$g6@up@&Et;

literal 0
HcmV?d00001

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
index 0ea5adf7..f421c673 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/function/Functions.java
@@ -32,6 +32,7 @@ import org.simantics.db.Resource;
 import org.simantics.db.Session;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.IndexRoot;
+import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
@@ -40,6 +41,7 @@ import org.simantics.db.exception.ServiceException;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables.Role;
 import org.simantics.db.procedure.Procedure;
+import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
@@ -280,9 +282,11 @@ public class Functions {
         }
 
         protected Map<String, Resource> getComposites(ReadGraph graph, Resource element) throws DatabaseException {
+            
             Resource indexRoot = graph.sync(new IndexRoot(element));
-            List<Resource> composites = ModelingUtils.searchByType(graph, indexRoot, StructuralResource2.getInstance(graph).Composite);
-            List<Resource> nonDistrictComposites = composites.stream().filter(comp -> {
+            List<Resource> diagrams = ModelingUtils.searchByType(graph, indexRoot, DiagramResource.getInstance(graph).Diagram);
+            
+            List<Resource> nonDistrictComposites = composites.values().stream().filter(comp -> {
                 try {
                     return !graph.isInstanceOf(comp, DistrictNetworkResource.getInstance(graph).Composite);
                 } catch (ServiceException e1) {
@@ -297,7 +301,7 @@ public class Functions {
                     String name = graph.getRelatedValue2(mapping, L0.HasName);
                     result.put(name, mapping);
                 } catch (DatabaseException e) {
-                    e.printStackTrace();
+                    LOGGER.error("Could not read name of " + mapping, e);
                 }
             });
             return result;
diff --git a/org.simantics.district.ui.feature/feature.xml b/org.simantics.district.ui.feature/feature.xml
index 8e0633e8..d4f241b2 100644
--- a/org.simantics.district.ui.feature/feature.xml
+++ b/org.simantics.district.ui.feature/feature.xml
@@ -48,4 +48,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.simantics.maps.server.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
-- 
2.45.1